]>
Commit | Line | Data |
---|---|---|
bcbc9f52 AM |
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 | |
4 | @@ -30,15 +30,15 @@ | |
5 | top_builddir=. | |
39c53e2a AM |
6 | SHELL=/bin/sh |
7 | ||
8 | -BASEDIR= @prefix@ | |
9 | -BINDIR = @bindir@ | |
bcbc9f52 | 10 | -DATADIR = @datadir@ |
39c53e2a AM |
11 | +BASEDIR= $(DESTDIR)@prefix@ |
12 | +BINDIR = $(DESTDIR)@bindir@ | |
bcbc9f52 AM |
13 | +DATADIR = $(DESTDIR)@datadir@ |
14 | # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode. | |
15 | -SBINDIR = @sbindir@ | |
39c53e2a AM |
16 | -LIBDIR = @libdir@ |
17 | -VARDIR = @localstatedir@ | |
bcbc9f52 | 18 | -CONFIGDIR = @configdir@ |
d6236c36 | 19 | -MANDIR = @mandir@ |
39c53e2a AM |
20 | +SBINDIR = $(DESTDIR)@sbindir@ |
21 | +LIBDIR = $(DESTDIR)@libdir@ | |
22 | +VARDIR = $(DESTDIR)@localstatedir@ | |
bcbc9f52 | 23 | +CONFIGDIR = $(DESTDIR)@configdir@ |
39c53e2a | 24 | +MANDIR = $(DESTDIR)@mandir@ |
d6236c36 | 25 | |
26 | # The permissions to give the executables | |
27 | INSTALLPERMS = 0755 | |
bcbc9f52 AM |
28 | @@ -58,7 +58,7 @@ |
29 | TDB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd.tdb | |
d6236c36 | 30 | |
39c53e2a AM |
31 | # This is where SWAT images and help files go |
32 | -SWATDIR = @swatdir@ | |
33 | +SWATDIR = $(DESTDIR)@swatdir@ | |
d6236c36 | 34 | |
39c53e2a AM |
35 | # the directory where lock files go |
36 | LOCKDIR = @lockdir@ | |
bcbc9f52 AM |
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 | |
39c53e2a | 40 | @@ -13,7 +13,7 @@ |
d6236c36 | 41 | |
bcbc9f52 | 42 | for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do |
39c53e2a AM |
43 | if [ ! -d $d ]; then |
44 | -mkdir $d | |
45 | +mkdir -p $d | |
46 | if [ ! -d $d ]; then | |
47 | echo Failed to make directory $d | |
48 | exit 1 | |
49 | @@ -34,7 +34,7 @@ | |
d6236c36 | 50 | |
39c53e2a AM |
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 | |
55 | fi | |
56 | done | |
d6236c36 | 57 | |
bcbc9f52 AM |
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 | |
39c53e2a AM |
61 | @@ -12,7 +12,7 @@ |
62 | echo Installing codepage files in $CODEPAGEDIR | |
63 | for d in $LIBDIR $CODEPAGEDIR; do | |
64 | if [ ! -d $d ]; then | |
65 | -mkdir $d | |
66 | +mkdir -p $d | |
67 | if [ ! -d $d ]; then | |
68 | echo Failed to make directory $d | |
69 | exit 1 | |
70 | @@ -23,11 +23,11 @@ | |
71 | for p in $*; do | |
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 | |
76 | fi | |
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 | |
81 | fi | |
82 | done | |
d6236c36 | 83 | |
bcbc9f52 AM |
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 | |
39c53e2a | 87 | @@ -11,7 +11,7 @@ |
d6236c36 | 88 | |
39c53e2a AM |
89 | for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do |
90 | if [ ! -d $d ]; then | |
91 | -mkdir $d | |
92 | +mkdir -p $d | |
93 | if [ ! -d $d ]; then | |
94 | echo Failed to make directory $d, does $USER have privileges? | |
95 | exit 1 | |
bcbc9f52 AM |
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 | |
39c53e2a | 99 | @@ -12,7 +12,7 @@ |
d6236c36 | 100 | |
39c53e2a AM |
101 | for d in $BINDIR; do |
102 | if [ ! -d $d ]; then | |
103 | - mkdir $d | |
104 | + mkdir -p $d | |
105 | if [ ! -d $d ]; then | |
106 | echo Failed to make directory $d | |
107 | echo Have you run installbin first? | |
bcbc9f52 AM |
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 | |
39c53e2a | 111 | @@ -10,7 +10,7 @@ |
d6236c36 | 112 | |
39c53e2a AM |
113 | for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do |
114 | if [ ! -d $d ]; then | |
bcbc9f52 AM |
115 | - mkdir $d |
116 | + mkdir -p $d | |
117 | if [ ! -d $d ]; then | |
118 | echo Failed to make directory $d, does $USER have privileges? | |
119 | exit 1 | |
39c53e2a | 120 | @@ -69,7 +69,7 @@ |
d6236c36 | 121 | |
39c53e2a AM |
122 | for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do |
123 | if [ ! -d $d ]; then | |
124 | - mkdir $d | |
125 | + mkdir -p $d | |
126 | if [ ! -d $d ]; then | |
127 | echo Failed to make directory $d, does $USER have privileges? | |
128 | exit 1 |