1 diff -urN samba-2.2.0.org/source/Makefile.in samba-2.2.0/source/Makefile.in
2 --- samba-2.2.0.org/source/Makefile.in Wed Apr 18 01:27:35 2001
3 +++ samba-2.2.0/source/Makefile.in Wed Apr 18 01:38:13 2001
11 +BASEDIR= $(DESTDIR)@prefix@
12 +BINDIR = $(DESTDIR)@bindir@
13 +DATADIR = $(DESTDIR)@datadir@
14 # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
17 -VARDIR = @localstatedir@
18 -CONFIGDIR = @configdir@
20 +SBINDIR = $(DESTDIR)@sbindir@
21 +LIBDIR = $(DESTDIR)@libdir@
22 +VARDIR = $(DESTDIR)@localstatedir@
23 +CONFIGDIR = $(DESTDIR)@configdir@
24 +MANDIR = $(DESTDIR)@mandir@
26 # The permissions to give the executables
29 TDB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd.tdb
31 # This is where SWAT images and help files go
33 +SWATDIR = $(DESTDIR)@swatdir@
35 # the directory where lock files go
37 diff -urN samba-2.2.0.org/source/script/installbin.sh samba-2.2.0/source/script/installbin.sh
38 --- samba-2.2.0.org/source/script/installbin.sh Wed Apr 18 01:27:39 2001
39 +++ samba-2.2.0/source/script/installbin.sh Wed Apr 18 01:36:43 2001
42 for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
47 echo Failed to make directory $d
51 # this is a special case, mount needs this in a specific location
52 if [ $p2 = smbmount ]; then
53 - ln -sf $BINDIR/$p2 /sbin/mount.smbfs
54 + ln -sf /usr/sbin/$p2 $DESTDIR/$SBINDIR/mount.smbfs
58 diff -urN samba-2.2.0.org/source/script/installcp.sh samba-2.2.0/source/script/installcp.sh
59 --- samba-2.2.0.org/source/script/installcp.sh Wed Apr 18 01:27:39 2001
60 +++ samba-2.2.0/source/script/installcp.sh Wed Apr 18 01:36:43 2001
62 echo Installing codepage files in $CODEPAGEDIR
63 for d in $LIBDIR $CODEPAGEDIR; do
68 echo Failed to make directory $d
72 if [ -f ${srcdir}/codepages/codepage_def.$p ]; then
73 echo Creating codepage file $CODEPAGEDIR/codepage.$p
74 - $BINDIR/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
75 + ${srcdir}/bin/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
77 if [ -f ${srcdir}/codepages/CP${p}.TXT ]; then
78 echo Creating unicode map $CODEPAGEDIR/unicode_map.$p
79 - $BINDIR/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
80 + ${srcdir}/bin/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
84 diff -urN samba-2.2.0.org/source/script/installman.sh samba-2.2.0/source/script/installman.sh
85 --- samba-2.2.0.org/source/script/installman.sh Wed Apr 18 01:27:39 2001
86 +++ samba-2.2.0/source/script/installman.sh Wed Apr 18 01:36:43 2001
89 for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
94 echo Failed to make directory $d, does $USER have privileges?
96 diff -urN samba-2.2.0.org/source/script/installscripts.sh samba-2.2.0/source/script/installscripts.sh
97 --- samba-2.2.0.org/source/script/installscripts.sh Wed Apr 18 01:27:39 2001
98 +++ samba-2.2.0/source/script/installscripts.sh Wed Apr 18 01:36:43 2001
106 echo Failed to make directory $d
107 echo Have you run installbin first?
108 diff -urN samba-2.2.0.org/source/script/installswat.sh samba-2.2.0/source/script/installswat.sh
109 --- samba-2.2.0.org/source/script/installswat.sh Wed Apr 18 01:27:39 2001
110 +++ samba-2.2.0/source/script/installswat.sh Wed Apr 18 01:38:55 2001
113 for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
118 echo Failed to make directory $d, does $USER have privileges?
122 for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
127 echo Failed to make directory $d, does $USER have privileges?