Merge changes between 3.0rc7 and 3.0rc8pl2.

1 files changed, 75 insertions, 15 deletions

diff --git a/Makefile.conf b/Makefile.conf
index 1d4a7945..a8c64ac6 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -19,6 +19,7 @@
 
 ## Defaults...
 SCRIPT = none
+USERBINDIR = /usr/bin
 BINDIR = /usr/sbin
 CLIENTBINDIR=/sbin
 ADMMANDIR = /usr/share/man/cat8
@@ -27,6 +28,8 @@ FFMANDIR = /usr/share/man/cat5
 FFMANEXT = .0
 LIBMANDIR = /usr/share/man/cat3
 LIBMANEXT = .0
+USRMANDIR = /usr/share/man/cat1
+USRMANEXT = .0
 MANCAT = cat
 INSTALL = install -c -m 444
 MANINSTALL = install -c
@@ -38,7 +41,7 @@ VARDB = /var/db
 LIBDIR=/usr/local/lib
 INCDIR=/usr/local/include
 LIBS =
-COPTS = $(BINDDEF)
+COPTS = $(BINDDEF) $(CC_OPTIONS)
 DEBUG = -g
 RANLIB = ranlib
 MKDEP = mkdep
@@ -86,14 +89,16 @@ MINORVERSION=MinorVersion
 ##--nextstep--
 #CF = cf/nextstep.h
 #CC=cc
-#COPTS = -Wall $(BINDDEF)
+#COPTS = -Wall $(BINDDEF) $(CC_OPTIONS)
 #BINDIR=/usr/etc
 #ADMMANDIR = /usr/local/man/cat8
 #FFMANDIR = /usr/local/man/cat5
 #LIBMANDIR = /usr/local/man/cat3
+#USRMANDIR = /usr/local/man/cat1
 #ADMMANEXT = .8
 #FFMANEXT = .5
 #LIBMANEXT = .3
+#USRMANEXT = .3
 #VARRUN = /etc
 #VARDB = /etc
 ##--nextstep--
@@ -119,7 +124,8 @@ MINORVERSION=MinorVersion
 #CC=gcc
 #COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
 #	 -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror \
-#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION)
+#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
+#	 $(CC_OPTIONS)
 #CF = cf/sunos5-5.h
 #ADMMANDIR = /usr/share/man/man1m
 #ADMMANEXT = .1m
@@ -127,6 +133,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .4
 #LIBMANDIR = /usr/share/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/share/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /etc
 #VARDB = /etc
@@ -140,7 +148,8 @@ MINORVERSION=MinorVersion
 #LIBS = -lresolv -lsocket -lnsl -lgen 
 #CC=cc
 #COPTS = -D__svr4__ $(BINDDEF) -erroff=E_END_OF_LOOP_CODE_NOT_REACHED \
-#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION)
+#	 -DSOLARIS_MAJOR=$(MAJORVERSION) -DSOLARIS_MINOR=$(MINORVERSION) \
+#	 $(CC_OPTIONS)
 #CF = cf/sunos5-5.h
 #ADMMANDIR = /usr/share/man/man1m
 #ADMMANEXT = .1m
@@ -148,6 +157,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .4
 #LIBMANDIR = /usr/share/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/share/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /etc
 #VARDB = /etc
@@ -156,7 +167,7 @@ MINORVERSION=MinorVersion
 
 ## DEC Alpha/OSF1
 ##--alphaosf--
-#COPTS = -std
+#COPTS = -std $(CC_OPTIONS)
 #INSTALL=/usr/ucb/installbsd -c
 #MANINSTALL=/usr/ucb/installbsd -c
 #CF = cf/alphaosf.h
@@ -195,10 +206,18 @@ MINORVERSION=MinorVersion
 ##--rhapsody--
 #CF = cf/rhapsody.h
 #COPTS  = -Wall -Wno-unused -Wno-implicit -Wno-comment \
-#	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF)
+#	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
 ##SCRIPT=rhapsody
 ##--rhapsody--
 
+## Darwin/MacOSX
+##--darwin--
+#CF = cf/rhapsody.h
+#COPTS  = -Ddarwin -Wall -Wno-unused -Wno-implicit -Wno-comment \
+#	  -Wno-uninitialized -Wno-switch -Werror -pipe $(BINDDEF) $(CC_OPTIONS)
+##SCRIPT=rhapsody
+##--darwin--
+
 ## NetBSD
 ##--netbsd--
 #CF = cf/netbsd.h
@@ -207,7 +226,7 @@ MINORVERSION=MinorVersion
 #	  -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
 #	  -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes \
 #	  -Wmissing-declarations -Wnested-externs \
-#	  -pipe $(BINDDEF)
+#	  -pipe $(BINDDEF) $(CC_OPTIONS)
 #SCRIPT=netbsd
 ##MKDEP=makedepend
 ##--netbsd--
@@ -224,7 +243,7 @@ MINORVERSION=MinorVersion
 #	  -Wimplicit-function-declaration -Wpointer-arith -Wcast-qual \
 #	  -Wwrite-strings -Wmissing-prototypes \
 #	  -Wmissing-declarations -Wnested-externs \
-#	  -pipe $(BINDDEF)
+#	  -pipe $(BINDDEF) $(CC_OPTIONS)
 #SCRIPT=netbsd
 ##--netbsd-nocast--
 
@@ -241,11 +260,14 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/cat3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/cat1
+#USRMANEXT = .1
 ##--ultrix--
 
 ## Linux 1.x
 ##--linux-1--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -253,6 +275,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
@@ -261,7 +285,8 @@ MINORVERSION=MinorVersion
 
 ## Linux 2.0
 ##--linux-2.0--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -269,6 +294,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
@@ -277,7 +304,8 @@ MINORVERSION=MinorVersion
 
 ## Linux 2.1
 ##--linux-2.1--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -285,6 +313,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
@@ -293,7 +323,8 @@ MINORVERSION=MinorVersion
 
 ## Linux 2.2
 ##--linux-2.2--
-#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) $(BINDDEF)
+#COPTS = -DLINUX_MAJOR=$(MAJORVERSION) -DLINUX_MINOR=$(MINORVERSION) \
+#        $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/linux.h
 #ADMMANDIR = /usr/man/man8
 #ADMMANEXT = .8
@@ -301,6 +332,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
@@ -340,6 +373,7 @@ MINORVERSION=MinorVersion
 #CC=gcc
 #PREDEFINES=-DSCO
 #LIBS = -lsocket
+#USERBINDIR = /usr/local/dhcp/bin
 #BINDIR = /usr/local/dhcp/bin
 #CLIENTBINDIR = /usr/local/dhcp/bin
 #ADMMANDIR = /usr/local/dhcp/man/cat.ADMN
@@ -365,9 +399,11 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #VARRUN = /etc
-#COPTS=-w3 -Dlint $(BINDDEF)
+#COPTS=-w3 -Dlint $(BINDDEF) $(CC_OPTIONS)
 #LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket
 #MANINSTALL = /bin/true 
 #INSTALL = cp
@@ -375,6 +411,26 @@ MINORVERSION=MinorVersion
 #CLIENTBINDIR = /etc
 ##--qnx--
 
+
+## QNX RTP (v6, NTO)
+##--qnxnto--
+#CF = cf/qnx.h
+#ADMMANDIR = /opt/man/man8
+#ADMMANEXT = .8
+#FFMANDIR = /opt/man/man5
+#FFMANEXT = .5
+#LIBMANDIR = /opt/man/man3
+#LIBMANEXT = .3
+#MANCAT = man
+#COPTS=-w3 -Dlint $(BINDDEF)
+#LFLAGS=-l socket
+#MANINSTALL = /bin/cp
+#INSTALL = /bin/cp
+#BINDIR = /opt/sbin
+#USERBINDIR= /opt/bin
+#CLIENTBINDIR = /opt/sbin
+##--qnxnto--
+
 ## CygWin32
 ##--cygwin32--
 #CF = cf/cygwin32.h
@@ -384,6 +440,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/man/man1
+#USRMANEXT = .1
 #VARRUN = /etc
 #MANINSTALL = /bin/true 
 #INSTALL = cp
@@ -402,7 +460,7 @@ MINORVERSION=MinorVersion
 ##--irix--
 #LFLAGS=$(DEBUG) -Wl,-woff,84 -Wl,-woff,85 -Wl,-woff,134
 #CC=gcc
-#COPTS = -I/usr/local/include $(BINDDEF)
+#COPTS = -I/usr/local/include $(BINDDEF) $(CC_OPTIONS)
 #CF = cf/irix.h
 #BINDIR = /usr/local/etc
 #ADMMANDIR = /usr/local/man/man8
@@ -411,6 +469,8 @@ MINORVERSION=MinorVersion
 #FFMANEXT = .5
 #LIBMANDIR = /usr/local/man/man3
 #LIBMANEXT = .3
+#USRMANDIR = /usr/local/man/man1
+#USRMANEXT = .1
 #MANCAT = man
 #INSTALL = install
 #MANINSTALL = install
@@ -422,7 +482,7 @@ MINORVERSION=MinorVersion
 
 ## HP-UX
 ##--hpux-cc--
-#COPTS = $(BINDDEF)
+#COPTS = $(BINDDEF) $(CC_OPTIONS)
 #LFLAGS = -Wl,+vnocompatwarnings
 #INSTALL = install -i
 #MANINSTALL = install -i