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
12 INCDIR=/usr/local/include
43 ## Solaris 2.5 (with gcc)
73 ## BSD/OS 2.1 through 4.0
82 #ADMMANDIR = /usr/man/man8
88 -#VARDB = /var/state/dhcp
89 +#VARDBS = /var/state/dhcp
90 +#VARDBC = /var/state/dhcp
98 -#VARDB = /var/state/dhcp
99 +#VARDBS = /var/state/dhcp
100 +#VARDBC = /var/state/dhcp
108 -#VARDB = /var/state/dhcp
109 +#VARDBS = /var/state/dhcp
110 +#VARDBC = /var/state/dhcp
118 -#VARDB = /var/state/dhcp
119 +#VARDBS = /var/state/dhcp
120 +#VARDBC = /var/state/dhcp
125 #MANINSTALL = compress
135 #MANINSTALL = compress
137 #VARRUN = /usr/local/dhcp/var
138 -#VARDB = /usr/local/dhcp/var
139 +#VARDBS = /usr/local/dhcp/var
140 +#VARDBC = /usr/local/dhcp/var
142 #CLIENT_PATH = '"PATH=/bin:/etc:/usr/bin:/tcb/bin:/usr/bin/X11:/usr/local/bin:/usr/local/dhcp/bin"'
148 -#VARDB = /usr/local/etc/dhcp
149 +#VARDBS = /usr/local/etc/dhcp
150 +#VARDBC = /usr/local/etc/dhcp
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
159 all: $(PROG) $(CATMANPAGES)
162 - for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \
163 + for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDBC); \
166 for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
168 nroff -man dhclient.man8 >dhclient.cat8
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
176 @@ -103,13 +103,13 @@
177 nroff -man dhclient-script.man8 >dhclient-script.cat8
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
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 \
193 nroff -man dhclient.conf.man5 >dhclient.conf.cat5
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
206 nroff -man dhcp-options.man5 >dhcp-options.cat5
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
213 dhcp-eval.cat5: dhcp-eval.man5
214 nroff -man dhcp-eval.man5 >dhcp-eval.cat5
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
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
227 nroff -man dhcpctl.man3 >dhcpctl.cat3
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
234 omshell.cat1: omshell.man1
235 nroff -man omshell.man1 >omshell.cat1
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
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
248 nroff -man dhcpctl.man3 >dhcpctl.cat3
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
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
261 nroff -man omapi.man3 >omapi.cat3
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
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
274 nroff -man dhcrelay.man8 >dhcrelay.cat8
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
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
287 all: $(PROG) $(CATMANPAGES)
290 - for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
291 + for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDBS); do \
293 for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
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
306 $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
308 nroff -man dhcpd.man8 >dhcpd.cat8
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
315 dhcpd.conf.cat5: dhcpd.conf.man5
316 nroff -man dhcpd.conf.man5 >dhcpd.conf.cat5
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
323 dhcpd.leases.cat5: dhcpd.leases.man5
324 nroff -man dhcpd.leases.man5 >dhcpd.leases.cat5
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
331 dhcpd: $(OBJS) $(COBJ) $(DHCPLIB)
332 Only in dhcp-3.1.0a3.VARDB/server: Makefile.dist~