-diff -Nru samba-2.0.6/source/Makefile.in samba-2.0.6.new/source/Makefile.in
---- samba-2.0.6/source/Makefile.in Thu Nov 25 07:53:50 1999
-+++ samba-2.0.6.new/source/Makefile.in Thu Nov 25 07:52:16 1999
-@@ -28,7 +28,6 @@
- SBINDIR = @sbindir@
- LIBDIR = @libdir@
- VARDIR = @localstatedir@
+diff -urN samba-2.0.7.org/source/Makefile.in samba-2.0.7/source/Makefile.in
+--- samba-2.0.7.org/source/Makefile.in Thu Oct 19 00:01:25 2000
++++ samba-2.0.7/source/Makefile.in Fri Oct 20 22:58:16 2000
+@@ -21,15 +21,16 @@
+ builddir=@builddir@
+ SHELL=/bin/sh
+
+-BASEDIR= @prefix@
+-BINDIR = @bindir@
++BASEDIR= $(DESTDIR)@prefix@
++BINDIR = $(DESTDIR)@bindir@
+ # we don't use sbindir because we want full compatibility with
+ # the previous releases of Samba
+-SBINDIR = @bindir@
+-LIBDIR = @libdir@
+-VARDIR = @localstatedir@
-MANDIR = @mandir@
+-SAMBABOOK = @sambabook@
++SBINDIR = $(DESTDIR)@sbindir@
++LIBDIR = $(DESTDIR)@libdir@
++VARDIR = $(DESTDIR)@localstatedir@
++MANDIR = $(DESTDIR)@mandir@
++SYSCONFDIR = $(DESTDIR)@sysconfdir@
++SAMBABOOK = $(DESTDIR)@sambabook@
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -448,27 +447,29 @@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS)
-
--install: installbin installman installscripts installcp installswat
-+install: installdirs installbin installman installscripts installcp installswat
-
- installdirs:
-- $(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
-- $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
-+ mkdir -p \
-+ $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
-+ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(CODEPAGEDIR) \
-+ $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
+@@ -49,7 +50,7 @@
+ SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
- installservers: all installdirs
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SPROGS)
+ # This is where SWAT images and help files go
+-SWATDIR = @swatdir@
++SWATDIR = $(DESTDIR)@swatdir@
- installbin: all installdirs
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
-- @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SPROGS)
-+ @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(PROGS)
+ # the directory where lock files go
+ LOCKDIR = @lockdir@
+diff -urN samba-2.0.7.org/source/script/installbin.sh samba-2.0.7/source/script/installbin.sh
+--- samba-2.0.7.org/source/script/installbin.sh Thu Oct 19 00:01:26 2000
++++ samba-2.0.7/source/script/installbin.sh Fri Oct 20 23:12:27 2000
+@@ -13,7 +13,7 @@
- installscripts: installdirs
-- @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-+ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+ for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do
+ if [ ! -d $d ]; then
+-mkdir $d
++mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d
+ exit 1
+@@ -34,7 +34,7 @@
- installcp: installdirs
-- @$(SHELL) $(srcdir)/script/installcp.sh $(srcdir) $(LIBDIR) $(CODEPAGEDIR) $(BINDIR) $(CODEPAGELIST)
-+ @$(SHELL) $(srcdir)/script/installcp.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(CODEPAGEDIR) $(DESTDIR)$(BINDIR) $(CODEPAGELIST)
+ # this is a special case, mount needs this in a specific location
+ if [ $p2 = smbmount ]; then
+- ln -sf $BINDIR/$p2 /sbin/mount.smbfs
++ ln -sf /usr/sbin/$p2 $DESTDIR/$SBINDIR/mount.smbfs
+ fi
+ done
- installswat: installdirs
-- @$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
-+ @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
+diff -urN samba-2.0.7.org/source/script/installcp.sh samba-2.0.7/source/script/installcp.sh
+--- samba-2.0.7.org/source/script/installcp.sh Thu Oct 19 00:01:26 2000
++++ samba-2.0.7/source/script/installcp.sh Fri Oct 20 23:07:24 2000
+@@ -12,7 +12,7 @@
+ echo Installing codepage files in $CODEPAGEDIR
+ for d in $LIBDIR $CODEPAGEDIR; do
+ if [ ! -d $d ]; then
+-mkdir $d
++mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d
+ exit 1
+@@ -23,11 +23,11 @@
+ for p in $*; do
+ if [ -f ${srcdir}/codepages/codepage_def.$p ]; then
+ echo Creating codepage file $CODEPAGEDIR/codepage.$p
+- $BINDIR/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
++ ${srcdir}/bin/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
+ fi
+ if [ -f ${srcdir}/codepages/CP${p}.TXT ]; then
+ echo Creating unicode map $CODEPAGEDIR/unicode_map.$p
+- $BINDIR/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
++ ${srcdir}/bin/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
+ fi
+ done
- # revert to the previously installed version
- revert:
-@@ -476,12 +477,12 @@
- @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
+diff -urN samba-2.0.7.org/source/script/installman.sh samba-2.0.7/source/script/installman.sh
+--- samba-2.0.7.org/source/script/installman.sh Thu Oct 19 00:01:26 2000
++++ samba-2.0.7/source/script/installman.sh Fri Oct 20 22:57:52 2000
+@@ -11,7 +11,7 @@
- installman:
-- @$(SHELL) $(srcdir)/script/installman.sh $(MANDIR) $(srcdir) "@ROFF@"
-+ @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(srcdir) "@ROFF@"
+ for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
+ if [ ! -d $d ]; then
+-mkdir $d
++mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d, does $USER have privileges?
+ exit 1
+diff -urN samba-2.0.7.org/source/script/installscripts.sh samba-2.0.7/source/script/installscripts.sh
+--- samba-2.0.7.org/source/script/installscripts.sh Thu Oct 19 00:01:26 2000
++++ samba-2.0.7/source/script/installscripts.sh Fri Oct 20 22:57:52 2000
+@@ -12,7 +12,7 @@
- uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
+ for d in $BINDIR; do
+ if [ ! -d $d ]; then
+- mkdir $d
++ mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d
+ echo Have you run installbin first?
+diff -urN samba-2.0.7.org/source/script/installswat.sh samba-2.0.7/source/script/installswat.sh
+--- samba-2.0.7.org/source/script/installswat.sh Thu Oct 19 00:01:26 2000
++++ samba-2.0.7/source/script/installswat.sh Fri Oct 20 23:00:27 2000
+@@ -10,7 +10,7 @@
- uninstallman:
-- @$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
-+ @$(SHELL) $(srcdir)/script/uninstallman.sh $(mandir) $(srcdir)
+ for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
+ if [ ! -d $d ]; then
+- mkdir $d
++ mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d, does $USER have privileges?
+ exit 1
+@@ -69,7 +69,7 @@
- uninstallbin:
- @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+ for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
+ if [ ! -d $d ]; then
+- mkdir $d
++ mkdir -p $d
+ if [ ! -d $d ]; then
+ echo Failed to make directory $d, does $USER have privileges?
+ exit 1
projects / packages / samba.git / blobdiff