diff options
| author | Gerald Carter <jerry@samba.org> | 2003-09-09 03:18:20 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-09-09 03:18:20 +0000 |
| commit | 3cf6eaebd6c57974d33934bf9647b0ab9f50f88e (patch) | |
| tree | 2fadaad0c5f22354650f4c64a07ab2c06aad0ec4 /packaging/Debian/debian/patches/installswat.sh.patch | |
| parent | 07643607a706464089bb4b5a8bd902742591b864 (diff) | |
| download | samba-3cf6eaebd6c57974d33934bf9647b0ab9f50f88e.tar.gz samba-3cf6eaebd6c57974d33934bf9647b0ab9f50f88e.tar.bz2 samba-3cf6eaebd6c57974d33934bf9647b0ab9f50f88e.zip | |
syncing packaging files from 3.0
(This used to be commit ccc2a0d3840f88625cf89d6739320728e830ef87)
Diffstat (limited to 'packaging/Debian/debian/patches/installswat.sh.patch')
| -rw-r--r-- | packaging/Debian/debian/patches/installswat.sh.patch | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch index ff5f23a1cf..b425e3bef7 100644 --- a/packaging/Debian/debian/patches/installswat.sh.patch +++ b/packaging/Debian/debian/patches/installswat.sh.patch @@ -1,5 +1,5 @@ ---- samba-3.0alpha23.orig/source/script/installswat.sh 2001-10-17 16:00:14.000000000 -0400 -+++ samba-3.0alpha23/source/script/installswat.sh 2003-04-06 03:18:29.000000000 -0400 +--- samba_3_0/source/script/installswat.sh.orig 2003-08-28 18:03:10.000000000 -0400 ++++ samba_3_0/source/script/installswat.sh 2003-08-28 18:11:14.000000000 -0400 @@ -9,7 +9,7 @@ echo Installing the Samba Web Administration Tool @@ -36,7 +36,7 @@ FNAME=$SWATDIR/$ln/help/`basename $f` echo $FNAME if [ "x$BOOKDIR" = "x" ]; then -@@ -49,31 +45,31 @@ +@@ -49,26 +45,24 @@ cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? rm -f $f chmod 0644 $FNAME @@ -62,23 +62,15 @@ cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges? chmod 0644 $FNAME + done ++ done +# Install html documentation +for f in $SRCDIR../docs/htmldocs/*.html; do -+ FNAME=$SWATDIR/help/`basename $f` -+ echo $FNAME -+ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? -+# chmod 0644 $FNAME ++ FNAME=$SWATDIR/help/`basename $f` ++ echo $FNAME ++ ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges? ++ chmod 0644 $FNAME done - # Install Using Samba book - --if [ "x$BOOKDIR" != "x" ]; then -+# For Debian we do not install anything here, we just create a symlink -+# pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in -+# debian/rules (peloy@debian.org) -+if /bin/false; then - - # Create directories - + # Install Using Samba book (but only if it is there) |