fixed the installation scripts for the new layout

10 files changed, 62 insertions, 55 deletions

diff --git a/source/Makefile.in b/source/Makefile.in
index b5816c4c39e..8f0bf969ecb 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -76,7 +76,7 @@ PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbrun bin/smbstatus
 PROGS2 = bin/smbpasswd bin/make_smbcodepage
 PROGS = $(PROGS1) $(PROGS2) bin/nmblookup bin/make_printerdef 
 
-SCRIPTS = smbtar addtosmbpass
+SCRIPTS = script/smbtar script/addtosmbpass
 
 
 ######################################################################
@@ -264,50 +264,47 @@ smbtorture: torture.o getsmbpass.o $(UTILOBJ) $(CLIENTUTIL)
 install: installbin installman installscripts installcp installswat
 
 installbin: all
-	@$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@$(SHELL) $(srcdir)/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
 
 installscripts:
-	@$(SHELL) $(srcdir)/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
 
 installcp:
-	@$(SHELL) $(srcdir)/installcp.sh $(LIBDIR) $(CODEPAGEDIR) $(BINDIR) $(CODEPAGELIST)
+	@$(SHELL) $(srcdir)/script/installcp.sh $(LIBDIR) $(CODEPAGEDIR) $(BINDIR) $(CODEPAGELIST)
 
 installswat:
-	@$(SHELL) $(srcdir)/installswat.sh $(SWATDIR) $(srcdir)
+	@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
 
 # revert to the previously installed version
 revert:
-	@$(SHELL) $(srcdir)/revert.sh $(SBINDIR) $(SPROGS) $(SCRIPTS)
-	@$(SHELL) $(srcdir)/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
+	@$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SPROGS) 
+	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
 
 installman:
-	@$(SHELL) $(srcdir)/installman.sh $(MANDIR) $(srcdir)
+	@$(SHELL) $(srcdir)/script/installman.sh $(MANDIR) $(srcdir)
 
 uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
 
 uninstallman:
-	@$(SHELL) $(srcdir)/uninstallman.sh $(MANDIR) $(srcdir)
+	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
 
 uninstallbin:
-	@$(SHELL) $(srcdir)/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-	@$(SHELL) $(srcdir)/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
 
 uninstallscripts:
-	@$(SHELL) $(srcdir)/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
+	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
 
 uninstallcp:
-	@$(SHELL) $(srcdir)/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
+	@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
 
 clean: 
-	@echo Cleaning up ...
-	@rm -f core *.o */*.o $(PROTOOBJ) lib/rpc/*/*.o *~ config.cache $(PROGS) $(SPROGS)
-
-cleandir:  clean
-	rm -f .depend tags
+	rm -f core */*.o */*~ *~ config.cache bin/*
 
 proto:
-	$(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | grep -v "ubiqx/"` > include/proto.h
+	@echo rebuilding include/proto.h
+	@$(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | grep -v "ubiqx/"` > include/proto.h
 
 etags:
 	etags `find . -name "*.[ch]"`
diff --git a/source/bin/.cvsignore b/source/bin/.cvsignore
index 753138a322e..d9307fe8e82 100644
--- a/source/bin/.cvsignore
+++ b/source/bin/.cvsignore
@@ -1,7 +1,12 @@
+make_printerdef
+make_smbcodepage
 nmbd
+nmblookup
 smbclient
 smbd
+smbpasswd
 smbrun
+smbstatus
 swat
 testparm
 testprns
diff --git a/source/script/installbin.sh b/source/script/installbin.sh
index b976a3e5ea8..22771ce5a07 100755
--- a/source/script/installbin.sh
+++ b/source/script/installbin.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 INSTALLPERMS=$1
 BASEDIR=$2
 BINDIR=$3
@@ -22,12 +23,13 @@ done
 
 
 for p in $*; do
- echo Installing $p as $BINDIR/$p
- if [ -f $BINDIR/$p ]; then
-   mv $BINDIR/$p $BINDIR/$p.old
+ p2=`basename $p`
+ echo Installing $p as $BINDIR/$p2
+ if [ -f $BINDIR/$p2 ]; then
+   mv $BINDIR/$p2 $BINDIR/$p2.old
  fi
- cp $p $BINDIR/$p
- chmod $INSTALLPERMS $BINDIR/$p
+ cp $p $BINDIR/
+ chmod $INSTALLPERMS $BINDIR/$p2
 done
 
 
diff --git a/source/script/installcp.sh b/source/script/installcp.sh
index c4f917113bc..d1bc7f62911 100755
--- a/source/script/installcp.sh
+++ b/source/script/installcp.sh
@@ -19,8 +19,8 @@ fi
 done
 
 for p in $*; do
- echo Creating codepage file $CODEPAGEDIR/codepage.$p from codepage_def.$p
- $BINDIR/make_smbcodepage c $p codepage_def.$p $CODEPAGEDIR/codepage.$p
+ echo Creating codepage file $CODEPAGEDIR/codepage.$p
+ $BINDIR/make_smbcodepage c $p codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
 done
 
 
diff --git a/source/script/installman.sh b/source/script/installman.sh
index 95611dcc227..12a63e26c0d 100755
--- a/source/script/installman.sh
+++ b/source/script/installman.sh
@@ -20,6 +20,7 @@ for sect in 1 5 7 8 ; do
   for m in $MANDIR/man$sect ; do
     for s in $SRCDIR../docs/*$sect; do
       FNAME=$m/`basename $s`
+      echo Installing $FNAME
       cp $s $m || echo Cannot create $FNAME... does $USER have privileges?
       chmod 0644 $FNAME
     done
diff --git a/source/script/installscripts.sh b/source/script/installscripts.sh
index 1a230c8cfa2..6d55317e9e1 100755
--- a/source/script/installscripts.sh
+++ b/source/script/installscripts.sh
@@ -22,13 +22,16 @@ for d in $BINDIR; do
 done
 
 for p in $*; do
-  echo Installing $BINDIR/$p
-  cp $p $BINDIR/$p
-  if [ ! -f $BINDIR/$p ]; then
-    echo Cannot copy $p... does $USER have privileges?
+  p2=`basename $p`
+  echo Installing $BINDIR/$p2
+  if [ -f $BINDIR/$p2 ]; then
+    mv $BINDIR/$p2 $BINDIR/$p2.old
+  fi
+  cp $p $BINDIR/
+  chmod $INSTALLPERMS $BINDIR/$p2
+  if [ ! -f $BINDIR/$p2 ]; then
+    echo Cannot copy $p2... does $USER have privileges?
   fi
-  echo Setting permissions on $BINDIR/$p
-  chmod $INSTALLPERMS $BINDIR/$p
 done
 
 cat << EOF
diff --git a/source/script/revert.sh b/source/script/revert.sh
index 68b47bf39d0..8df5fd2fbde 100755
--- a/source/script/revert.sh
+++ b/source/script/revert.sh
@@ -3,11 +3,14 @@ BINDIR=$1
 shift
 
 for p in $*; do
- if [ -f $BINDIR/$p.old ]; then
-   echo Restoring $BINDIR/$p.old as $BINDIR/$p
-   mv $BINDIR/$p $BINDIR/$p.new
-   mv $BINDIR/$p.old $BINDIR/$p
-   rm -f $BINDIR/$p.new
+ p2=`basename $p`
+ if [ -f $BINDIR/$p2.old ]; then
+   echo Restoring $BINDIR/$p2.old
+   mv $BINDIR/$p2 $BINDIR/$p2.new
+   mv $BINDIR/$p2.old $BINDIR/$p2
+   rm -f $BINDIR/$p2.new
+ else
+   echo Not restoring $p
  fi
 done
 
diff --git a/source/script/uninstallbin.sh b/source/script/uninstallbin.sh
index fab36804a29..53775f89465 100755
--- a/source/script/uninstallbin.sh
+++ b/source/script/uninstallbin.sh
@@ -19,13 +19,12 @@ if [ ! -d $BINDIR ]; then
 fi
 
 for p in $*; do
-  if [ ! -f $BINDIR/$p ]; then
-    echo $BINDIR/$p does not exist!
-  else
-    echo Removing $BINDIR/$p
-    rm -f $BINDIR/$p
-    if [ -f $BINDIR/$p ]; then
-      echo Cannot remove $BINDIR/$p... does $USER have privileges?
+  p2=`basename $p`
+  if [ -f $BINDIR/$p2 ]; then
+    echo Removing $BINDIR/$p2
+    rm -f $BINDIR/$p2
+    if [ -f $BINDIR/$p2 ]; then
+      echo Cannot remove $BINDIR/$p2 ... does $USER have privileges?
     fi
   fi
 done
diff --git a/source/script/uninstallman.sh b/source/script/uninstallman.sh
index b4d4bfc1f92..b6d2524ec77 100755
--- a/source/script/uninstallman.sh
+++ b/source/script/uninstallman.sh
@@ -8,14 +8,12 @@ echo Uninstalling man pages from $MANDIR
 
 for sect in 1 5 7 8 ; do
   for m in $MANDIR/man$sect ; do
-    for s in $SRCDIR../docs/*$sect; do
+    for s in $SRCDIR/../docs/*$sect; do
       FNAME=$m/`basename $s`
       if test -f $FNAME; then
         echo Deleting $FNAME
         rm -f $FNAME 
         test -f $FNAME && echo Cannot remove $FNAME... does $USER have privileges?   
-      else
-        echo $FNAME does not exist! Check defines in the Makefile
       fi
     done
   done
diff --git a/source/script/uninstallscripts.sh b/source/script/uninstallscripts.sh
index ae907546f2e..13104acedd8 100755
--- a/source/script/uninstallscripts.sh
+++ b/source/script/uninstallscripts.sh
@@ -14,13 +14,12 @@ if [ ! -d $BINDIR ]; then
 fi
 
 for p in $*; do
-  if [ ! -f $BINDIR/$p ]; then
-    echo $BINDIR/$p does not exist!
-  else
-    echo Removing $BINDIR/$p
-    rm -f $BINDIR/$p
-    if [ -f $BINDIR/$p ]; then
-      echo Cannot remove $BINDIR/$p... does $USER have privileges?
+  p2=`basename $p`
+  if [ -f $BINDIR/$p2 ]; then
+    echo Removing $BINDIR/$p2
+    rm -f $BINDIR/$p2
+    if [ -f $BINDIR/$p2 ]; then
+      echo Cannot remove $BINDIR/$p2 ... does $USER have privileges?
     fi
   fi
 done