]>
Commit | Line | Data |
---|---|---|
5df3a0b1 JR |
1 | diff -ur dhcp-3.1.0a3/Makefile.conf dhcp-3.1.0a3.VARDB/Makefile.conf |
2 | --- dhcp-3.1.0a3/Makefile.conf 2005-07-07 18:39:07.000000000 +0200 | |
3 | +++ dhcp-3.1.0a3.VARDB/Makefile.conf 2007-04-16 13:16:11.000000000 +0200 | |
4 | @@ -41,7 +41,8 @@ | |
5 | CATMANPAGES = | |
6 | ETC = /etc | |
7 | VARRUN = /var/run | |
8 | -VARDB = /var/db | |
9 | +VARDBS = /var/db | |
10 | +VARDBC = /var/db | |
11 | LIBDIR=/usr/local/lib | |
12 | INCDIR=/usr/local/include | |
13 | LIBS = | |
14 | @@ -88,7 +89,8 @@ | |
15 | #ADMMANEXT = .8 | |
16 | #FFMANEXT = .5 | |
17 | #VARRUN = /etc | |
18 | -#VARDB = /etc | |
19 | +#VARDBS = /etc | |
20 | +#VARDBC = /etc | |
21 | ##--aix-- | |
22 | ||
23 | ## NEXTSTEP 3.x,4.x | |
24 | @@ -106,7 +108,8 @@ | |
25 | #LIBMANEXT = .3 | |
26 | #USRMANEXT = .3 | |
27 | #VARRUN = /etc | |
28 | -#VARDB = /etc | |
29 | +#VARDBS = /etc | |
30 | +#VARDBC = /etc | |
31 | ##--nextstep-- | |
32 | ||
33 | ## SunOS 4.1 | |
34 | @@ -119,7 +122,8 @@ | |
35 | #ADMMANEXT = .8 | |
36 | #FFMANEXT = .5 | |
37 | #VARRUN = /etc | |
38 | -#VARDB = /etc | |
39 | +#VARDBS = /etc | |
40 | +#VARDBC = /etc | |
41 | ##--sunos4-- | |
42 | ||
43 | ## Solaris 2.5 (with gcc) | |
44 | @@ -143,7 +147,8 @@ | |
45 | #USRMANEXT = .1 | |
46 | #MANCAT = man | |
47 | #VARRUN = /etc | |
48 | -#VARDB = /etc | |
49 | +#VARDBS = /etc | |
50 | +#VARDBC = /etc | |
51 | #SCRIPT=solaris | |
52 | ##--sunos5-gcc-- | |
53 | ||
54 | @@ -167,7 +172,8 @@ | |
55 | #USRMANEXT = .1 | |
56 | #MANCAT = man | |
57 | #VARRUN = /etc | |
58 | -#VARDB = /etc | |
59 | +#VARDBS = /etc | |
60 | +#VARDBC = /etc | |
61 | #SCRIPT=solaris | |
62 | ##--sunos5-cc-- | |
63 | ||
64 | @@ -179,7 +185,8 @@ | |
65 | #CF = cf/alphaosf.h | |
66 | #ADMMANEXT = .8 | |
67 | #FFMANEXT = .5 | |
68 | -#VARDB = /etc | |
69 | +#VARDBS = /etc | |
70 | +#VARDBC = /etc | |
71 | ##--alphaosf-- | |
72 | ||
73 | ## BSD/OS 2.1 through 4.0 | |
74 | @@ -242,7 +249,8 @@ | |
75 | #BINDIR = /usr/etc | |
76 | #CLIENTBINDIR=/etc | |
77 | #VARRUN = /etc | |
78 | -#VARDB = /etc | |
79 | +#VARDBS = /etc | |
80 | +#VARDBC = /etc | |
81 | #CF = cf/ultrix.h | |
82 | #ADMMANDIR = /usr/man/man8 | |
83 | #ADMMANEXT = .8 | |
84 | @@ -269,7 +277,8 @@ | |
85 | #USRMANEXT = .1 | |
86 | #MANCAT = man | |
87 | #VARRUN = /var/run | |
88 | -#VARDB = /var/state/dhcp | |
89 | +#VARDBS = /var/state/dhcp | |
90 | +#VARDBC = /var/state/dhcp | |
91 | #SCRIPT=linux | |
92 | ##--linux-1-- | |
93 | ||
94 | @@ -288,7 +297,8 @@ | |
95 | #USRMANEXT = .1 | |
96 | #MANCAT = man | |
97 | #VARRUN = /var/run | |
98 | -#VARDB = /var/state/dhcp | |
99 | +#VARDBS = /var/state/dhcp | |
100 | +#VARDBC = /var/state/dhcp | |
101 | #SCRIPT=linux | |
102 | ##--linux-2.0-- | |
103 | ||
104 | @@ -307,7 +317,8 @@ | |
105 | #USRMANEXT = .1 | |
106 | #MANCAT = man | |
107 | #VARRUN = /var/run | |
108 | -#VARDB = /var/state/dhcp | |
109 | +#VARDBS = /var/state/dhcp | |
110 | +#VARDBC = /var/state/dhcp | |
111 | #SCRIPT=linux | |
112 | ##--linux-2.1-- | |
113 | ||
114 | @@ -326,7 +337,8 @@ | |
115 | #USRMANEXT = .1 | |
116 | #MANCAT = man | |
117 | #VARRUN = /var/run | |
118 | -#VARDB = /var/state/dhcp | |
119 | +#VARDBS = /var/state/dhcp | |
120 | +#VARDBC = /var/state/dhcp | |
121 | #SCRIPT=linux | |
122 | ##--linux-2.2-- | |
123 | ||
124 | @@ -353,7 +365,8 @@ | |
125 | #MANINSTALL = compress | |
126 | #MANTO = > | |
127 | #VARRUN = /etc | |
128 | -#VARDB = /etc | |
129 | +#VARDBS = /etc | |
130 | +#VARDBC = /etc | |
131 | #CATMANPAGES= | |
132 | ##--sco-cc-- | |
133 | ||
134 | @@ -375,7 +388,8 @@ | |
135 | #MANINSTALL = compress | |
136 | #MANTO = > | |
137 | #VARRUN = /usr/local/dhcp/var | |
138 | -#VARDB = /usr/local/dhcp/var | |
139 | +#VARDBS = /usr/local/dhcp/var | |
140 | +#VARDBC = /usr/local/dhcp/var | |
141 | #CATMANPAGES= | |
142 | #CLIENT_PATH = '"PATH=/bin:/etc:/usr/bin:/tcb/bin:/usr/bin/X11:/usr/local/bin:/usr/local/dhcp/bin"' | |
143 | ##--sco-gcc-- | |
144 | @@ -467,7 +481,8 @@ | |
145 | #CHMOD = chmod | |
146 | #ETC = /etc | |
147 | #VARRUN = /etc | |
148 | -#VARDB = /usr/local/etc/dhcp | |
149 | +#VARDBS = /usr/local/etc/dhcp | |
150 | +#VARDBC = /usr/local/etc/dhcp | |
151 | ##--irix-- | |
152 | ||
153 | ## HP-UX | |
154 | Only in dhcp-3.1.0a3.VARDB: Makefile.conf~ | |
155 | diff -ur dhcp-3.1.0a3/client/Makefile.dist dhcp-3.1.0a3.VARDB/client/Makefile.dist | |
156 | --- dhcp-3.1.0a3/client/Makefile.dist 2005-03-17 21:14:55.000000000 +0100 | |
157 | +++ dhcp-3.1.0a3.VARDB/client/Makefile.dist 2007-04-16 13:10:27.000000000 +0200 | |
158 | @@ -38,7 +38,7 @@ | |
159 | all: $(PROG) $(CATMANPAGES) | |
160 | ||
161 | install: all | |
162 | - for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \ | |
163 | + for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDBC); \ | |
164 | do \ | |
165 | foo=""; \ | |
166 | for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ | |
167 | @@ -95,7 +95,7 @@ | |
168 | nroff -man dhclient.man8 >dhclient.cat8 | |
169 | ||
170 | dhclient.man8: dhclient.8 | |
171 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
172 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \ | |
173 | -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ | |
174 | -e "s#RUNDIR#$(VARRUN)#g" < dhclient.8 >dhclient.man8 | |
175 | ||
176 | @@ -103,13 +103,13 @@ | |
177 | nroff -man dhclient-script.man8 >dhclient-script.cat8 | |
178 | ||
179 | dhclient-script.man8: dhclient-script.8 | |
180 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
181 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \ | |
182 | -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ | |
183 | -e "s#RUNDIR#$(VARRUN)#g" < dhclient-script.8 \ | |
184 | >dhclient-script.man8 | |
185 | ||
186 | dhclient.conf.man5: dhclient.conf.5 | |
187 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
188 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \ | |
189 | -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ | |
190 | -e "s#RUNDIR#$(VARRUN)#g" < dhclient.conf.5 \ | |
191 | >dhclient.conf.man5 | |
192 | @@ -118,7 +118,7 @@ | |
193 | nroff -man dhclient.conf.man5 >dhclient.conf.cat5 | |
194 | ||
195 | dhclient.leases.man5: dhclient.leases.5 | |
196 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
197 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \ | |
198 | -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ | |
199 | -e "s#RUNDIR#$(VARRUN)#g" < dhclient.leases.5 \ | |
200 | >dhclient.leases.man5 | |
201 | Only in dhcp-3.1.0a3.VARDB/client: Makefile.dist~ | |
202 | diff -ur dhcp-3.1.0a3/common/Makefile.dist dhcp-3.1.0a3.VARDB/common/Makefile.dist | |
203 | --- dhcp-3.1.0a3/common/Makefile.dist 2005-03-17 21:14:56.000000000 +0100 | |
204 | +++ dhcp-3.1.0a3.VARDB/common/Makefile.dist 2007-04-16 13:11:38.000000000 +0200 | |
205 | @@ -82,14 +82,14 @@ | |
206 | nroff -man dhcp-options.man5 >dhcp-options.cat5 | |
207 | ||
208 | dhcp-options.man5: dhcp-options.5 | |
209 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
210 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
211 | -e "s#RUNDIR#$(VARRUN)#g" < dhcp-options.5 >dhcp-options.man5 | |
212 | ||
213 | dhcp-eval.cat5: dhcp-eval.man5 | |
214 | nroff -man dhcp-eval.man5 >dhcp-eval.cat5 | |
215 | ||
216 | dhcp-eval.man5: dhcp-eval.5 | |
217 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
218 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
219 | -e "s#RUNDIR#$(VARRUN)#g" < dhcp-eval.5 >dhcp-eval.man5 | |
220 | ||
221 | # Dependencies (semi-automatically-generated) | |
222 | Only in dhcp-3.1.0a3.VARDB/common: Makefile.dist~ | |
223 | diff -ur dhcp-3.1.0a3/dhcpctl/Makefile.dist dhcp-3.1.0a3.VARDB/dhcpctl/Makefile.dist | |
224 | --- dhcp-3.1.0a3/dhcpctl/Makefile.dist 2005-03-17 21:15:02.000000000 +0100 | |
225 | +++ dhcp-3.1.0a3.VARDB/dhcpctl/Makefile.dist 2007-04-16 13:12:33.000000000 +0200 | |
226 | @@ -98,14 +98,14 @@ | |
227 | nroff -man dhcpctl.man3 >dhcpctl.cat3 | |
228 | ||
229 | dhcpctl.man3: dhcpctl.3 | |
230 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
231 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
232 | -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 | |
233 | ||
234 | omshell.cat1: omshell.man1 | |
235 | nroff -man omshell.man1 >omshell.cat1 | |
236 | ||
237 | omshell.man1: omshell.1 | |
238 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
239 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
240 | -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 | |
241 | ||
242 | # Dependencies (semi-automatically-generated) | |
243 | Only in dhcp-3.1.0a3.VARDB/dhcpctl: Makefile.dist~ | |
244 | diff -ur dhcp-3.1.0a3/minires/Makefile.dist dhcp-3.1.0a3.VARDB/minires/Makefile.dist | |
245 | --- dhcp-3.1.0a3/minires/Makefile.dist 2005-03-17 21:15:17.000000000 +0100 | |
246 | +++ dhcp-3.1.0a3.VARDB/minires/Makefile.dist 2007-04-16 13:13:13.000000000 +0200 | |
247 | @@ -67,7 +67,7 @@ | |
248 | nroff -man dhcpctl.man3 >dhcpctl.cat3 | |
249 | ||
250 | dhcpctl.man3: dhcpctl.3 | |
251 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
252 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
253 | -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 | |
254 | ||
255 | # Dependencies (semi-automatically-generated) | |
256 | Only in dhcp-3.1.0a3.VARDB/minires: Makefile.dist~ | |
257 | diff -ur dhcp-3.1.0a3/omapip/Makefile.dist dhcp-3.1.0a3.VARDB/omapip/Makefile.dist | |
258 | --- dhcp-3.1.0a3/omapip/Makefile.dist 2005-03-17 21:15:20.000000000 +0100 | |
259 | +++ dhcp-3.1.0a3.VARDB/omapip/Makefile.dist 2007-04-16 13:13:22.000000000 +0200 | |
260 | @@ -106,7 +106,7 @@ | |
261 | nroff -man omapi.man3 >omapi.cat3 | |
262 | ||
263 | omapi.man3: omapi.3 | |
264 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
265 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
266 | -e "s#RUNDIR#$(VARRUN)#g" < omapi.3 >omapi.man3 | |
267 | ||
268 | # Dependencies (semi-automatically-generated) | |
269 | Only in dhcp-3.1.0a3.VARDB/omapip: Makefile.dist~ | |
270 | diff -ur dhcp-3.1.0a3/relay/Makefile.dist dhcp-3.1.0a3.VARDB/relay/Makefile.dist | |
271 | --- dhcp-3.1.0a3/relay/Makefile.dist 2005-03-17 21:15:24.000000000 +0100 | |
272 | +++ dhcp-3.1.0a3.VARDB/relay/Makefile.dist 2007-04-16 13:13:58.000000000 +0200 | |
273 | @@ -79,7 +79,7 @@ | |
274 | nroff -man dhcrelay.man8 >dhcrelay.cat8 | |
275 | ||
276 | dhcrelay.man8: dhcrelay.8 | |
277 | - sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDB)#" \ | |
278 | + sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDBS)#" \ | |
279 | -e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 >dhcrelay.man8 | |
280 | ||
281 | dhcrelay: dhcrelay.o $(DHCPLIB) | |
282 | Only in dhcp-3.1.0a3.VARDB/relay: Makefile.dist~ | |
283 | diff -ur dhcp-3.1.0a3/server/Makefile.dist dhcp-3.1.0a3.VARDB/server/Makefile.dist | |
284 | --- dhcp-3.1.0a3/server/Makefile.dist 2006-07-25 15:26:00.000000000 +0200 | |
285 | +++ dhcp-3.1.0a3.VARDB/server/Makefile.dist 2007-04-16 13:14:23.000000000 +0200 | |
286 | @@ -38,7 +38,7 @@ | |
287 | all: $(PROG) $(CATMANPAGES) | |
288 | ||
289 | install: all | |
290 | - for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \ | |
291 | + for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDBS); do \ | |
292 | foo=""; \ | |
293 | for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ | |
294 | foo=$${foo}/$$bar; \ | |
295 | @@ -56,9 +56,9 @@ | |
296 | $(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT) | |
297 | $(MANINSTALL) $(MANFROM) dhcpd.leases.$(MANCAT)5 $(MANTO) \ | |
298 | $(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT) | |
299 | - $(TOUCH) $(DESTDIR)$(VARDB)/dhcpd.leases | |
300 | + $(TOUCH) $(DESTDIR)$(VARDBS)/dhcpd.leases | |
301 | # Note file mode is hardcoded to mode 0664 in server/db.c (889). | |
302 | - $(CHMOD) 664 $(DESTDIR)$(VARDB)/dhcpd.leases | |
303 | + $(CHMOD) 664 $(DESTDIR)$(VARDBS)/dhcpd.leases | |
304 | ||
305 | depend: | |
306 | $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS) | |
307 | @@ -88,21 +88,21 @@ | |
308 | nroff -man dhcpd.man8 >dhcpd.cat8 | |
309 | ||
310 | dhcpd.man8: dhcpd.8 | |
311 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
312 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
313 | -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.8 >dhcpd.man8 | |
314 | ||
315 | dhcpd.conf.cat5: dhcpd.conf.man5 | |
316 | nroff -man dhcpd.conf.man5 >dhcpd.conf.cat5 | |
317 | ||
318 | dhcpd.conf.man5: dhcpd.conf.5 | |
319 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
320 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
321 | -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.conf.5 >dhcpd.conf.man5 | |
322 | ||
323 | dhcpd.leases.cat5: dhcpd.leases.man5 | |
324 | nroff -man dhcpd.leases.man5 >dhcpd.leases.cat5 | |
325 | ||
326 | dhcpd.leases.man5: dhcpd.leases.5 | |
327 | - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ | |
328 | + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \ | |
329 | -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5 | |
330 | ||
331 | dhcpd: $(OBJS) $(COBJ) $(DHCPLIB) | |
332 | Only in dhcp-3.1.0a3.VARDB/server: Makefile.dist~ |