1 diff -urN samba-2.2.1.org/source/Makefile.in samba-2.2.1/source/Makefile.in
2 --- samba-2.2.1.org/source/Makefile.in Sun Jul 8 22:29:34 2001
3 +++ samba-2.2.1/source/Makefile.in Wed Jul 11 20:06:00 2001
11 +BASEDIR= $(DESTDIR)@prefix@
12 +BINDIR = $(DESTDIR)@bindir@
13 +DATADIR = $(DESTDIR)@datadir@
15 # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
18 -VARDIR = @localstatedir@
19 -CONFIGDIR = @configdir@
21 -INCLUDEDIR = @includedir@
22 +SBINDIR = $(DESTDIR)@sbindir@
23 +LIBDIR = $(DESTDIR)@libdir@
24 +VARDIR = $(DESTDIR)@localstatedir@
25 +CONFIGDIR = $(DESTDIR)@configdir@
26 +MANDIR = $(DESTDIR)@mandir@
28 # The permissions to give the executables
31 TDB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd.tdb
33 # This is where SWAT images and help files go
35 +SWATDIR = $(DESTDIR)@swatdir@
37 # the directory where lock files go
39 diff -urN samba-2.2.1.org/source/script/installbin.sh samba-2.2.1/source/script/installbin.sh
40 --- samba-2.2.1.org/source/script/installbin.sh Fri Jan 12 20:28:02 2001
41 +++ samba-2.2.1/source/script/installbin.sh Wed Jul 11 20:06:59 2001
44 for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
49 echo Failed to make directory $d
53 # this is a special case, mount needs this in a specific location
54 if [ $p2 = smbmount ]; then
55 - ln -sf $BINDIR/$p2 /sbin/mount.smbfs
56 + ln -sf /usr/sbin/$p2 $DESTDIR/$SBINDIR/mount.smbfs
60 diff -urN samba-2.2.1.org/source/script/installcp.sh samba-2.2.1/source/script/installcp.sh
61 --- samba-2.2.1.org/source/script/installcp.sh Mon Dec 13 14:27:43 1999
62 +++ samba-2.2.1/source/script/installcp.sh Wed Jul 11 20:08:20 2001
64 echo Installing codepage files in $CODEPAGEDIR
65 for d in $LIBDIR $CODEPAGEDIR; do
70 echo Failed to make directory $d
74 if [ -f ${srcdir}/codepages/codepage_def.$p ]; then
75 echo Creating codepage file $CODEPAGEDIR/codepage.$p
76 - $BINDIR/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
78 +${srcdir}/bin/make_smbcodepage c $p ${srcdir}/codepages/codepage_def.$p $CODEPAGEDIR/codepage.$p
80 if [ -f ${srcdir}/codepages/CP${p}.TXT ]; then
81 echo Creating unicode map $CODEPAGEDIR/unicode_map.$p
82 - $BINDIR/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
84 +${srcdir}/bin/make_unicodemap $p ${srcdir}/codepages/CP${p}.TXT $CODEPAGEDIR/unicode_map.$p
89 diff -urN samba-2.2.1.org/source/script/installman.sh samba-2.2.1/source/script/installman.sh
90 --- samba-2.2.1.org/source/script/installman.sh Tue Nov 17 21:50:05 1998
91 +++ samba-2.2.1/source/script/installman.sh Wed Jul 11 20:08:49 2001
94 for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
99 echo Failed to make directory $d, does $USER have privileges?
101 diff -urN samba-2.2.1.org/source/script/installscripts.sh samba-2.2.1/source/script/installscripts.sh
102 --- samba-2.2.1.org/source/script/installscripts.sh Mon Dec 13 14:27:44 1999
103 +++ samba-2.2.1/source/script/installscripts.sh Wed Jul 11 20:09:11 2001
109 - if [ ! -d $d ]; then
111 + if [ ! -d $d ]; then
112 echo Failed to make directory $d
113 echo Have you run installbin first?
115 diff -urN samba-2.2.1.org/source/script/installswat.sh samba-2.2.1/source/script/installswat.sh
116 --- samba-2.2.1.org/source/script/installswat.sh Mon Apr 16 03:34:11 2001
117 +++ samba-2.2.1/source/script/installswat.sh Wed Jul 11 20:09:59 2001
120 for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do
125 echo Failed to make directory $d, does $USER have privileges?
129 for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do
132 - if [ ! -d $d ]; then
134 + if [ ! -d $d ]; then
135 echo Failed to make directory $d, does $USER have privileges?