]>
Commit | Line | Data |
---|---|---|
88610303 JR |
1 | diff -ur inn-2.2.2.orig/Makefile.global.in inn-2.2.2/Makefile.global.in |
2 | --- inn-2.2.2.orig/Makefile.global.in Mon Dec 13 14:18:37 1999 | |
3 | +++ inn-2.2.2/Makefile.global.in Sat Jan 29 22:56:17 2000 | |
4 | @@ -38,6 +38,7 @@ | |
5 | TCLLIB = @TCL_LIB@ | |
6 | TCLINC = @TCL_INC@ | |
7 | EXTRA_SRC = @EXTRA_SRC@ | |
8 | +INSTALL = @INSTALL@ | |
9 | ||
10 | OWNER = -O @NEWSUSER@ -G @NEWSGRP@ | |
11 | ROWNER = -O @NEWSUSER@ -G uucp | |
12 | Only in inn-2.2.2: Makefile.global.in~ | |
13 | diff -ur inn-2.2.2.orig/backends/Makefile inn-2.2.2/backends/Makefile | |
14 | --- inn-2.2.2.orig/backends/Makefile Mon Dec 13 14:18:37 1999 | |
15 | +++ inn-2.2.2/backends/Makefile Sat Jan 29 22:46:54 2000 | |
16 | @@ -17,8 +17,8 @@ | |
17 | ||
18 | install: all | |
19 | for i in ${ALL}; \ | |
20 | - do $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 \ | |
21 | - -b .OLD $${i} $D${PATHBIN}/$${i}; \ | |
22 | + do $(LIBTOOL) --mode=install $(INSTALL) -m 0555 \ | |
23 | + $${i} $D${PATHBIN}; \ | |
24 | done | |
25 | ||
26 | clobber clean: | |
27 | Only in inn-2.2.2/backends: Makefile~ | |
28 | diff -ur inn-2.2.2.orig/configure.in inn-2.2.2/configure.in | |
29 | --- inn-2.2.2.orig/configure.in Mon Dec 13 14:18:37 1999 | |
30 | +++ inn-2.2.2/configure.in Sat Jan 29 22:57:07 2000 | |
31 | @@ -129,6 +129,7 @@ | |
32 | AC_PROG_YACC | |
33 | AC_PROG_LEX | |
34 | AC_PROG_RANLIB | |
35 | +AC_PROG_INSTALL | |
36 | ||
37 | dnl System specific | |
38 | AC_AIX | |
39 | Only in inn-2.2.2: configure.in~ | |
40 | diff -ur inn-2.2.2.orig/expire/Makefile inn-2.2.2/expire/Makefile | |
41 | --- inn-2.2.2.orig/expire/Makefile Mon Dec 13 14:18:37 1999 | |
42 | +++ inn-2.2.2/expire/Makefile Sat Jan 29 22:49:09 2000 | |
43 | @@ -85,25 +85,25 @@ | |
44 | ||
45 | ## Low-level install actions. | |
46 | $D$(PATHBIN)/convdate: convdate | |
47 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
48 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
49 | $D$(PATHBIN)/expire: expire | |
50 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
51 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
52 | $D$(PATHBIN)/expireover: expireover | |
53 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
54 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
55 | $D$(PATHBIN)/expireindex: expireindex | |
56 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
57 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
58 | $D$(PATHBIN)/fastrm: fastrm | |
59 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
60 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
61 | $D$(PATHBIN)/grephistory: grephistory | |
62 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
63 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
64 | $D$(PATHBIN)/makeactive: makeactive | |
65 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
66 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
67 | $D$(PATHBIN)/makehistory: makehistory | |
68 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
69 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
70 | $D$(PATHBIN)/newsrequeue: newsrequeue | |
71 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
72 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
73 | $D$(PATHBIN)/prunehistory: prunehistory | |
74 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
75 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
76 | ||
77 | ## Dependencies. Default list, below, is probably good enough. | |
78 | depend: Makefile $(SOURCES) | |
79 | Only in inn-2.2.2/expire: Makefile~ | |
80 | diff -ur inn-2.2.2.orig/frontends/Makefile inn-2.2.2/frontends/Makefile | |
81 | --- inn-2.2.2.orig/frontends/Makefile Mon Dec 13 14:18:37 1999 | |
82 | +++ inn-2.2.2/frontends/Makefile Sat Jan 29 22:50:56 2000 | |
83 | @@ -64,25 +64,25 @@ | |
84 | ||
85 | ## Low-level install actions. | |
86 | $D$(PATHBIN)/inews: inews | |
ff495aa3 | 87 | - $(LIBTOOL) ../installit.sh $(OWNER) -m $(INEWSMODE) -b .OLD $? $@ |
88610303 JR |
88 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) |
89 | $D$(PATHBIN)/rnews: rnews | |
ff495aa3 | 90 | - $(LIBTOOL) ../installit.sh $(ROWNER) -m $(RNEWSMODE) -b .OLD $? $@ |
88610303 JR |
91 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) |
92 | $D$(PATHBIN)/ctlinnd: ctlinnd | |
93 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD $? $@ | |
94 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
95 | $D$(PATHBIN)/sm: sm | |
96 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD $? $@ | |
97 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
98 | $D$(PATHBIN)/getlist: getlist | |
99 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
100 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
101 | $D$(PATHBIN)/innconfval: innconfval | |
102 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
103 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
104 | $D$(RNEWSPROGS)/c7unbatch: c7unbatch.sh | |
105 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
106 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
107 | $D$(RNEWSPROGS)/gunbatch: gunbatch.sh | |
108 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
109 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
110 | $D$(RNEWSPROGS)/decode: decode | |
111 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
112 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
113 | $D$(RNEWSPROGS)/encode: encode | |
114 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
115 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
116 | ||
117 | ## Dependencies. Default list, below, is probably good enough. | |
118 | depend: Makefile $(SOURCES) | |
119 | Only in inn-2.2.2/frontends: Makefile~ | |
120 | diff -ur inn-2.2.2.orig/innd/Makefile inn-2.2.2/innd/Makefile | |
121 | --- inn-2.2.2.orig/innd/Makefile Mon Dec 13 14:18:37 1999 | |
122 | +++ inn-2.2.2/innd/Makefile Sat Jan 29 22:51:57 2000 | |
123 | @@ -18,10 +18,10 @@ | |
124 | install: $D${PATHBIN}/innd $D${PATHBIN}/inndstart | |
125 | ||
126 | $D${PATHBIN}/innd: innd | |
127 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD innd $D${PATHBIN}/innd | |
128 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
129 | ||
130 | $D${PATHBIN}/inndstart: inndstart | |
131 | - -$(LIBTOOL) ../installit.sh -O root -G $(NEWSGROUP) -m 4550 -b .OLD inndstart $D${PATHBIN}/inndstart | |
132 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
133 | @ME=`(whoami || /usr/ucb/whoami) 2> /dev/null` ;\ | |
134 | if [ "X$$ME" = Xroot ]; then \ | |
135 | echo $@ has been installed setuid root. ;\ | |
136 | Only in inn-2.2.2/innd: Makefile~ | |
137 | diff -ur inn-2.2.2.orig/innfeed/Makefile inn-2.2.2/innfeed/Makefile | |
138 | --- inn-2.2.2.orig/innfeed/Makefile Mon Dec 13 14:18:37 1999 | |
139 | +++ inn-2.2.2/innfeed/Makefile Sat Jan 29 22:55:52 2000 | |
140 | @@ -89,7 +89,6 @@ | |
141 | MV = mv | |
142 | TAG = etags | |
143 | CHMOD = chmod | |
144 | -INSTALL = $(LIBTOOL) install -c | |
145 | ||
146 | MAKEDEPEND = ./makedepend | |
147 | DEPENDFLAGS = -s -c '$(CC) -E' | |
148 | @@ -111,19 +110,19 @@ | |
149 | $(LINK.c) -o $@ $(OBJS) version.o $(LIBNEWS) $(LIBNEWS) $(LIBS) | |
150 | ||
151 | $D$(PATHBIN)/innfeed: innfeed | |
152 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@ | |
153 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
154 | ||
155 | $D$(PATHBIN)/procbatch: procbatch | |
156 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@ | |
157 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
158 | ||
159 | ||
160 | $D$(PATHBIN)/innfeed-convcfg: innfeed-convcfg | |
161 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@ | |
162 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
163 | $(SAVEOLD) | |
164 | $(COPYFILE) | |
165 | ||
166 | $D$(PATHBIN)/startinnfeed: startinnfeed | |
167 | - -$(LIBTOOL) ../installit.sh -O root -G $(NEWSGROUP) -m 4550 -b .OLD $? $@ | |
168 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
169 | @ME=`(whoami || /usr/ucb/whoami) 2> /dev/null` ;\ | |
170 | if [ "X$$ME" = Xroot ]; then \ | |
171 | echo $@ has been installed setuid root. ;\ | |
172 | Only in inn-2.2.2/innfeed: Makefile~ | |
173 | diff -ur inn-2.2.2.orig/lib/Makefile inn-2.2.2/lib/Makefile | |
174 | --- inn-2.2.2.orig/lib/Makefile Mon Dec 13 14:18:37 1999 | |
175 | +++ inn-2.2.2/lib/Makefile Sat Jan 29 22:53:01 2000 | |
176 | @@ -103,7 +103,7 @@ | |
177 | ## Low-level install actions. | |
178 | $(D)$(PATHLIB)/libinn.$(EXTLIB): libinn.$(EXTLIB) | |
179 | @rm -f $@ | |
180 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD libinn.$(EXTLIB) $@ | |
181 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHLIB) | |
182 | ||
183 | ## Dependencies. Default list, below, is probably good enough. | |
184 | depend: Makefile $(SOURCES) ../include/dbz.h | |
185 | Only in inn-2.2.2/lib: Makefile~ | |
186 | diff -ur inn-2.2.2.orig/nnrpd/Makefile inn-2.2.2/nnrpd/Makefile | |
187 | --- inn-2.2.2.orig/nnrpd/Makefile Mon Dec 13 14:18:37 1999 | |
188 | +++ inn-2.2.2/nnrpd/Makefile Sat Jan 29 22:53:30 2000 | |
189 | @@ -22,11 +22,11 @@ | |
190 | ||
191 | ## Low-level install actions. | |
192 | $D$(NNRPD): nnrpd | |
193 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
194 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
195 | ||
196 | ## Low-level install actions. | |
197 | $D$(ACTIVED): actived | |
198 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@ | |
199 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN) | |
200 | ||
201 | clobber clean: | |
202 | rm -f *.o $(ALL) | |
203 | Only in inn-2.2.2/nnrpd: Makefile~ | |
204 | diff -ur inn-2.2.2.orig/storage/Makefile inn-2.2.2/storage/Makefile | |
205 | --- inn-2.2.2.orig/storage/Makefile Mon Dec 13 14:18:37 1999 | |
206 | +++ inn-2.2.2/storage/Makefile Sat Jan 29 22:54:07 2000 | |
207 | @@ -68,7 +68,7 @@ | |
208 | ## Low-level install actions. | |
209 | $(D)$(PATHLIB)/libstorage.$(EXTLIB): libstorage.$(EXTLIB) | |
210 | @rm -f $@ | |
211 | - $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD libstorage.$(EXTLIB) $@ | |
212 | + $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHLIB) | |
213 | ||
214 | ## Dependencies. Default list, below, is probably good enough. | |
215 | depend: Makefile $(SOURCES) | |
216 | Only in inn-2.2.2/storage: Makefile~ |