-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.2.1.org/source/Makefile.in samba-2.2.1/source/Makefile.in
+--- samba-2.2.1.org/source/Makefile.in Sun Jul 8 22:29:34 2001
++++ samba-2.2.1/source/Makefile.in Wed Jul 11 20:06:00 2001
+@@ -28,16 +28,16 @@
+ top_builddir=.
+ SHELL=/bin/sh
+
+-BASEDIR= @prefix@
+-BINDIR = @bindir@
+-DATADIR = @datadir@
++BASEDIR= $(DESTDIR)@prefix@
++BINDIR = $(DESTDIR)@bindir@
++DATADIR = $(DESTDIR)@datadir@
++
+ # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
+-SBINDIR = @sbindir@
+-LIBDIR = @libdir@
+-VARDIR = @localstatedir@
+-CONFIGDIR = @configdir@
-MANDIR = @mandir@
+-INCLUDEDIR = @includedir@
++SBINDIR = $(DESTDIR)@sbindir@
++LIBDIR = $(DESTDIR)@libdir@
++VARDIR = $(DESTDIR)@localstatedir@
++CONFIGDIR = $(DESTDIR)@configdir@
++MANDIR = $(DESTDIR)@mandir@
# 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
+@@ -57,7 +57,7 @@
+ TDB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd.tdb
- 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
+ # This is where SWAT images and help files go
+-SWATDIR = @swatdir@
++SWATDIR = $(DESTDIR)@swatdir@
- 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)
+ # the directory where lock files go
+ LOCKDIR = @lockdir@
+diff -urN samba-2.2.1.org/source/script/installbin.sh samba-2.2.1/source/script/installbin.sh
+--- samba-2.2.1.org/source/script/installbin.sh Fri Jan 12 20:28:02 2001
++++ samba-2.2.1/source/script/installbin.sh Wed Jul 11 20:06:59 2001
+@@ -13,7 +13,7 @@
- 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)
+ for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; 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 @@
- installscripts: installdirs
-- @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-+ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+ # 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
- 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)
+diff -urN samba-2.2.1.org/source/script/installcp.sh samba-2.2.1/source/script/installcp.sh
+--- samba-2.2.1.org/source/script/installcp.sh Mon Dec 13 14:27:43 1999
++++ samba-2.2.1/source/script/installcp.sh Wed Jul 11 20:08:20 2001
+@@ -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,12 +23,12 @@
+ 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
+- fi
++${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
+- fi
++${srcdir}/bin/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
++fi
+ done
- installswat: installdirs
-- @$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
-+ @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
- # revert to the previously installed version
- revert:
-@@ -476,12 +477,12 @@
- @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS)
+diff -urN samba-2.2.1.org/source/script/installman.sh samba-2.2.1/source/script/installman.sh
+--- samba-2.2.1.org/source/script/installman.sh Tue Nov 17 21:50:05 1998
++++ samba-2.2.1/source/script/installman.sh Wed Jul 11 20:08:49 2001
+@@ -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.2.1.org/source/script/installscripts.sh samba-2.2.1/source/script/installscripts.sh
+--- samba-2.2.1.org/source/script/installscripts.sh Mon Dec 13 14:27:44 1999
++++ samba-2.2.1/source/script/installscripts.sh Wed Jul 11 20:09:11 2001
+@@ -12,8 +12,8 @@
- uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
+ for d in $BINDIR; do
+ if [ ! -d $d ]; then
+- mkdir $d
+- if [ ! -d $d ]; then
++ mkdir -p $d
++ if [ ! -d $d ]; then
+ echo Failed to make directory $d
+ echo Have you run installbin first?
+ exit 1
+diff -urN samba-2.2.1.org/source/script/installswat.sh samba-2.2.1/source/script/installswat.sh
+--- samba-2.2.1.org/source/script/installswat.sh Mon Apr 16 03:34:11 2001
++++ samba-2.2.1/source/script/installswat.sh Wed Jul 11 20:09:59 2001
+@@ -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,8 +69,8 @@
- 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
+- if [ ! -d $d ]; then
++ mkdir -p $d
++ if [ ! -d $d ]; then
+ echo Failed to make directory $d, does $USER have privileges?
+ exit 1
+ fi
projects / packages / samba.git / blobdiff