Clean up the handling of --with-nsupdate

diff --git a/Makefile.conf b/Makefile.conf
index d8056018b33163f0e826cbf5dcaf9b8081f34a90..e41012a1dffc8abb2c9d5909939f586670dd7fad 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -37,7 +37,7 @@ VARRUN = /var/run
 VARDB = /var/db
 LIBDIR=/usr/local/lib
 INCDIR=/usr/local/include
-LIBS = $(BINDLIB)
+LIBS =
 COPTS = $(BINDDEF)
 RANLIB = ranlib
 
@@ -104,7 +104,7 @@ MINORVERSION=MinorVersion
 
 ## SunOS 4.1
 ##--sunos4--
-#LIBS = $(BINDLIB) -lresolv
+#LIBS = -lresolv
 #CF = cf/sunos4.h
 #BINDIR=/usr/etc
 #CLIENTBINDIR=/etc
@@ -118,7 +118,7 @@ MINORVERSION=MinorVersion
 ##--sunos5-gcc--
 #INSTALL=/usr/ucb/install
 #MANINSTALL=/usr/ucb/install
-#LIBS = $(BINDLIB) -lresolv -lsocket -lnsl -lgen 
+#LIBS = -lresolv -lsocket -lnsl -lgen 
 #CC=gcc
 #COPTS = $(BINDDEF) -Wall -Wno-unused -Wno-implicit -Wno-comment \
 #       -Wno-uninitialized -Wno-char-subscripts -Wno-switch -Werror
@@ -138,7 +138,7 @@ MINORVERSION=MinorVersion
 ##--sunos5-cc--
 #INSTALL=/usr/ucb/install
 #MANINSTALL=/usr/ucb/install
-#LIBS = $(BINDLIB) -lresolv -lsocket -lnsl -lgen 
+#LIBS = -lresolv -lsocket -lnsl -lgen 
 #CC=cc
 #COPTS = -D__svr4__ $(BINDDEF)
 #CF = cf/sunos5-5.h
@@ -166,7 +166,7 @@ MINORVERSION=MinorVersion
 
 ## BSD/OS 2.1 and higher.
 ##--bsdos--
-#LIBS = $(BINDLIB) -lresolv
+#LIBS = -lresolv
 #CC=gcc2
 #CF = cf/bsdos.h
 #SCRIPT=bsdos
@@ -180,8 +180,6 @@ MINORVERSION=MinorVersion
 
 ## FreeBSD
 ##--freebsd--
-#BINDLIBDEF = -L/usr/local/lib -lbind
-#BINDINCDEF = -I/usr/local/include/bind
 #CF = cf/freebsd.h
 #SCRIPT=freebsd
 ##--freebsd--

diff --git a/client/Makefile.dist b/client/Makefile.dist
index 7dce08c2bdee30787fed08872f5a5e8923e86ceb..1c075655e4a37ecc9468d6863bfddd2869bf97a8 100644 (file)
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhclient.8 dhclient.conf.5 dhclient-script.8 dhclient.leases.5
 
 DEBUG  = -g
 INCLUDES = -I.. $(BINDINC) -I../includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a
+DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 25c00f954473c8bddbdeea752e44db54fa808027..1a7b372f01343f67722ccf2f11b3a38c5d44d5b4 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 
 DEBUG  = -g
 INCLUDES = -I.. $(BINDINC) -I../includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a
+DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)