From: Ted Lemon Date: Sat, 22 Feb 1997 14:44:56 +0000 (+0000) Subject: Move some more parameters around X-Git-Tag: DHCP_970222~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de60690e73e2035a6638d112fdc879993fd4d26c;p=thirdparty%2Fdhcp.git Move some more parameters around --- diff --git a/Makefile.conf b/Makefile.conf index 268f59bb3..423212d4a 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -40,8 +40,7 @@ FFMANEXT = .0 INSTALL = install -c MANINSTALL = install -c CHMOD = chmod -CATMANPAGES = dhcpd.cat8 dhclient.cat8 dhcrelay.cat8 \ - dhcpd.conf.cat5 dhclient.conf.cat5 +CATMANPAGES = ETC = /etc VARRUN = /var/run VARDB = /var/db diff --git a/client/Makefile.dist b/client/Makefile.dist index 3a15dfeda..3afddb0aa 100644 --- a/client/Makefile.dist +++ b/client/Makefile.dist @@ -29,163 +29,10 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # -## Defaults... -BINDIR = /usr/sbin -ADMMANDIR = /usr/share/man/cat8 -ADMMANEXT = .0 -FFMANDIR = /usr/share/man/cat5 -FFMANEXT = .0 -INSTALL = install -MANINSTALL = install -CHMOD = chmod CATMANPAGES = dhclient.cat8 dhclient.conf.cat5 -ETC = /etc -VARRUN = /var/run -VARDB = /var/db - -## Porting:: -# -# For each supported operating system, there is a block of text below -# beginning with #--os-name-- and ending with #--os-name--. Between -# these delimiters are assignments, commented out, which define the -# Makefile variables required for that operating system. -# -# The configure shell script figures out what operating system it's -# being run on and then runs Makefile.dist through a sed script which -# removes the comment characters from the appropriate set of -# assignments, and writes the output to Makefile. - -## SunOS 4.1 -##--sunos4-- -#LIBS = -lresolv -#CF = cf/sunos4.h -#BINDIR=/usr/etc -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--sunos4-- - -## Solaris 2.5 (with gcc) -##--sunos5-gcc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=gcc -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-gcc-- - -## Solaris 2.5 (with Sun cc) -##--sunos5-cc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=cc -#COPTS = -D__svr4__ -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-cc-- - -## DEC Alpha/OSF1 -##--alphaosf-- -#INSTALL=/usr/ucb/installbsd -#MANINSTALL=/usr/ucb/installbsd -#LIBS= -#CF = cf/alphaosf.h -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--alphaosf-- - -## BSD/OS 2.1 -##--bsdos-- -#LIBS= -#CC=gcc2 -#CF = cf/bsdos.h -##--bsdos-- - -## FreeBSD -##--freebsd-- -#CF = cf/freebsd.h -##--freebsd-- - -## NetBSD -##--netbsd-- -#CF = cf/netbsd.h -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -##--netbsd-- - -## Ultrix -##--ultrix-- -#CF = cf/ultrix.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -##--ultrix-- - -## Linux -##--linux-- -#CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /var/run -#VARDB = /var/dhcpd -##--linux-- - -## SCO -##--sco-- -#CF = cf/sco.h -#PREDEFINES=-DSCO -DBROKEN_ANSI -#BINDUR = /usr/etc -#ADMMANDIR = /usr/man/cat.ADMN -#ADMMANEXT = .ADMN.Z -#FFMANDIR = /usr/man/cat.SFF -#FFMANEXT = .SFF.Z -#INSTALL = cp -#MANFROM = < -#MANINSTALL = compress -#MANTO = > -#VARRUN = /etc -#VARDB = /etc -#CATMANPAGES= -##--sco-- - -## QNX -##--qnx-- -#CF = cf/qnx.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /etc -#COPTS=-w3 -Dlint -#LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket -#MANINSTALL = /bin/true -#INSTALL = cp -#BINDIR = /etc -##--qnx-- - SRCS = dhclient.c clparse.c OBJS = dhclient.o clparse.o -PROG = dhclient +PROG = dhclient MAN = dhclient.8 dhclient.conf.5 DEBUG = -g @@ -198,10 +45,10 @@ all: $(PROG) $(CATMANPAGES) install: $(PROG) $(CATMANPAGES) $(INSTALL) dhclient $(BINDIR); $(CHMOD) 755 $(BINDIR)/dhclient if [ x$(SCRIPT) = xnone ]; then \ - echo "No client script available." \ + echo "No client script available."; \ else \ - $(INSTALL) scripts/$(SCRIPT) $(ETCDIR)/dhclient-script \ - $(CHMOD) 700 $(ETCDIR)/dhclient-script \ + $(INSTALL) scripts/$(SCRIPT) $(ETCDIR)/dhclient-script; \ + $(CHMOD) 700 $(ETCDIR)/dhclient-script; \ fi if [ ! -d $(ADMMANDIR) ]; then \ mkdir $(ADMMANDIR); \ diff --git a/common/Makefile.dist b/common/Makefile.dist index e90db6727..5d4d28931 100644 --- a/common/Makefile.dist +++ b/common/Makefile.dist @@ -29,159 +29,6 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # -## Defaults... -BINDIR = /usr/sbin -ADMMANDIR = /usr/share/man/cat8 -ADMMANEXT = .0 -FFMANDIR = /usr/share/man/cat5 -FFMANEXT = .0 -INSTALL = install -MANINSTALL = install -CHMOD = chmod -ETC = /etc -VARRUN = /var/run -VARDB = /var/db - -## Porting:: -# -# For each supported operating system, there is a block of text below -# beginning with #--os-name-- and ending with #--os-name--. Between -# these delimiters are assignments, commented out, which define the -# Makefile variables required for that operating system. -# -# The configure shell script figures out what operating system it's -# being run on and then runs Makefile.dist through a sed script which -# removes the comment characters from the appropriate set of -# assignments, and writes the output to Makefile. - -## SunOS 4.1 -##--sunos4-- -#LIBS = -lresolv -#CF = cf/sunos4.h -#BINDIR=/usr/etc -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--sunos4-- - -## Solaris 2.5 (with gcc) -##--sunos5-gcc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=gcc -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-gcc-- - -## Solaris 2.5 (with Sun cc) -##--sunos5-cc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=cc -#COPTS = -D__svr4__ -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-cc-- - -## DEC Alpha/OSF1 -##--alphaosf-- -#INSTALL=/usr/ucb/installbsd -#MANINSTALL=/usr/ucb/installbsd -#LIBS= -#CF = cf/alphaosf.h -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--alphaosf-- - -## BSD/OS 2.1 -##--bsdos-- -#LIBS= -#CC=gcc2 -#CF = cf/bsdos.h -##--bsdos-- - -## FreeBSD -##--freebsd-- -#CF = cf/freebsd.h -##--freebsd-- - -## NetBSD -##--netbsd-- -#CF = cf/netbsd.h -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -##--netbsd-- - -## Ultrix -##--ultrix-- -#CF = cf/ultrix.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -##--ultrix-- - -## Linux -##--linux-- -#CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /var/run -#VARDB = /var/dhcpd -##--linux-- - -## SCO -##--sco-- -#CF = cf/sco.h -#PREDEFINES=-DSCO -DBROKEN_ANSI -#BINDUR = /usr/etc -#ADMMANDIR = /usr/man/cat.ADMN -#ADMMANEXT = .ADMN.Z -#FFMANDIR = /usr/man/cat.SFF -#FFMANEXT = .SFF.Z -#INSTALL = cp -#MANFROM = < -#MANINSTALL = compress -#MANTO = > -#VARRUN = /etc -#VARDB = /etc -#CATMANPAGES= -##--sco-- - -## QNX -##--qnx-- -#CF = cf/qnx.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /etc -#COPTS=-w3 -Dlint -#LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket -#MANINSTALL = /bin/true -#INSTALL = cp -#BINDIR = /etc -##--qnx-- - SRC = raw.c parse.c nit.c dispatch.c conflex.c bpf.c socket.c \ packet.c memory.c print.c options.c inet.c convert.c \ tree.c tables.c hash.c alloc.c errwarn.o diff --git a/relay/Makefile.dist b/relay/Makefile.dist index 209d2ca44..80f5ef8fa 100644 --- a/relay/Makefile.dist +++ b/relay/Makefile.dist @@ -29,160 +29,7 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # -## Defaults... -BINDIR = /usr/sbin -ADMMANDIR = /usr/share/man/cat8 -ADMMANEXT = .0 -FFMANDIR = /usr/share/man/cat5 -FFMANEXT = .0 -INSTALL = install -MANINSTALL = install -CHMOD = chmod CATMANPAGES = dhcrelay.cat8 -ETC = /etc -VARRUN = /var/run -VARDB = /var/db - -## Porting:: -# -# For each supported operating system, there is a block of text below -# beginning with #--os-name-- and ending with #--os-name--. Between -# these delimiters are assignments, commented out, which define the -# Makefile variables required for that operating system. -# -# The configure shell script figures out what operating system it's -# being run on and then runs Makefile.dist through a sed script which -# removes the comment characters from the appropriate set of -# assignments, and writes the output to Makefile. - -## SunOS 4.1 -##--sunos4-- -#LIBS = -lresolv -#CF = cf/sunos4.h -#BINDIR=/usr/etc -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--sunos4-- - -## Solaris 2.5 (with gcc) -##--sunos5-gcc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=gcc -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-gcc-- - -## Solaris 2.5 (with Sun cc) -##--sunos5-cc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=cc -#COPTS = -D__svr4__ -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-cc-- - -## DEC Alpha/OSF1 -##--alphaosf-- -#INSTALL=/usr/ucb/installbsd -#MANINSTALL=/usr/ucb/installbsd -#LIBS= -#CF = cf/alphaosf.h -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--alphaosf-- - -## BSD/OS 2.1 -##--bsdos-- -#LIBS= -#CC=gcc2 -#CF = cf/bsdos.h -##--bsdos-- - -## FreeBSD -##--freebsd-- -#CF = cf/freebsd.h -##--freebsd-- - -## NetBSD -##--netbsd-- -#CF = cf/netbsd.h -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -##--netbsd-- - -## Ultrix -##--ultrix-- -#CF = cf/ultrix.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -##--ultrix-- - -## Linux -##--linux-- -#CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /var/run -#VARDB = /var/dhcpd -##--linux-- - -## SCO -##--sco-- -#CF = cf/sco.h -#PREDEFINES=-DSCO -DBROKEN_ANSI -#BINDUR = /usr/etc -#ADMMANDIR = /usr/man/cat.ADMN -#ADMMANEXT = .ADMN.Z -#FFMANDIR = /usr/man/cat.SFF -#FFMANEXT = .SFF.Z -#INSTALL = cp -#MANFROM = < -#MANINSTALL = compress -#MANTO = > -#VARRUN = /etc -#VARDB = /etc -#CATMANPAGES= -##--sco-- - -## QNX -##--qnx-- -#CF = cf/qnx.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /etc -#COPTS=-w3 -Dlint -#LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket -#MANINSTALL = /bin/true -#INSTALL = cp -#BINDIR = /etc -##--qnx-- - SRCS = dhcrelay.c OBJS = dhcrelay.o PROG = dhcrelay diff --git a/server/Makefile.dist b/server/Makefile.dist index 48aa0c6fe..0ee8a66c2 100644 --- a/server/Makefile.dist +++ b/server/Makefile.dist @@ -29,160 +29,7 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # -## Defaults... -BINDIR = /usr/sbin -ADMMANDIR = /usr/share/man/cat8 -ADMMANEXT = .0 -FFMANDIR = /usr/share/man/cat5 -FFMANEXT = .0 -INSTALL = install -MANINSTALL = install -CHMOD = chmod CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 -ETC = /etc -VARRUN = /var/run -VARDB = /var/db - -## Porting:: -# -# For each supported operating system, there is a block of text below -# beginning with #--os-name-- and ending with #--os-name--. Between -# these delimiters are assignments, commented out, which define the -# Makefile variables required for that operating system. -# -# The configure shell script figures out what operating system it's -# being run on and then runs Makefile.dist through a sed script which -# removes the comment characters from the appropriate set of -# assignments, and writes the output to Makefile. - -## SunOS 4.1 -##--sunos4-- -#LIBS = -lresolv -#CF = cf/sunos4.h -#BINDIR=/usr/etc -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--sunos4-- - -## Solaris 2.5 (with gcc) -##--sunos5-gcc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=gcc -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-gcc-- - -## Solaris 2.5 (with Sun cc) -##--sunos5-cc-- -#INSTALL=/usr/ucb/install -#MANINSTALL=/usr/ucb/install -#LIBS = -lresolv -lsocket -lnsl -lgen -#CC=cc -#COPTS = -D__svr4__ -#CF = cf/sunos5-5.h -#ADMMANDIR = /usr/share/man/cat1m -#ADMMANEXT = .1m -#FFMANDIR = /usr/share/man/cat4 -#FFMANEXT = .4 -#VARRUN = /etc -#VARDB = /etc -##--sunos5-cc-- - -## DEC Alpha/OSF1 -##--alphaosf-- -#INSTALL=/usr/ucb/installbsd -#MANINSTALL=/usr/ucb/installbsd -#LIBS= -#CF = cf/alphaosf.h -#ADMMANEXT = .8 -#FFMANEXT = .5 -#VARRUN = /etc -#VARDB = /etc -##--alphaosf-- - -## BSD/OS 2.1 -##--bsdos-- -#LIBS= -#CC=gcc2 -#CF = cf/bsdos.h -##--bsdos-- - -## FreeBSD -##--freebsd-- -#CF = cf/freebsd.h -##--freebsd-- - -## NetBSD -##--netbsd-- -#CF = cf/netbsd.h -#COPTS = -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment \ -# -Wno-uninitialized -Werror -##--netbsd-- - -## Ultrix -##--ultrix-- -#CF = cf/ultrix.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -##--ultrix-- - -## Linux -##--linux-- -#CF = cf/linux.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /var/run -#VARDB = /var/dhcpd -##--linux-- - -## SCO -##--sco-- -#CF = cf/sco.h -#PREDEFINES=-DSCO -DBROKEN_ANSI -#BINDUR = /usr/etc -#ADMMANDIR = /usr/man/cat.ADMN -#ADMMANEXT = .ADMN.Z -#FFMANDIR = /usr/man/cat.SFF -#FFMANEXT = .SFF.Z -#INSTALL = cp -#MANFROM = < -#MANINSTALL = compress -#MANTO = > -#VARRUN = /etc -#VARDB = /etc -#CATMANPAGES= -##--sco-- - -## QNX -##--qnx-- -#CF = cf/qnx.h -#ADMMANDIR = /usr/man/man8 -#ADMMANEXT = .8 -#FFMANDIR = /usr/man/man5 -#FFMANEXT = .5 -#VARRUN = /etc -#COPTS=-w3 -Dlint -#LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket -#MANINSTALL = /bin/true -#INSTALL = cp -#BINDIR = /etc -##--qnx-- - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o PROG = dhcpd