diff options
author | Francis Dupont <fdupont@isc.org> | 2016-09-28 16:36:21 +0200 |
---|---|---|
committer | Francis Dupont <fdupont@isc.org> | 2016-09-28 16:36:21 +0200 |
commit | e94e7f2380bc96bfe237b347e97aa85d0722bf61 (patch) | |
tree | 63edcb41af41e78b3199161cd9724662ee511a04 /client/Makefile.am | |
parent | b13b616bb7a1e71e330abbd52e61efd0b98bcd8f (diff) | |
download | isc-dhcp-e94e7f2380bc96bfe237b347e97aa85d0722bf61.tar.gz |
Finished rebased
Diffstat (limited to 'client/Makefile.am')
-rw-r--r-- | client/Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 2cb83d80..4730536f 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -4,10 +4,8 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests -BINDLIBDIR = @BINDDIR@/lib - -AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' +AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' dist_sysconf_DATA = dhclient.conf.example sbin_PROGRAMS = dhclient @@ -15,7 +13,10 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ + @BINDLIBIRSDIR@/libirs.a \ + @BINDLIBDNSDIR@/libdns.a \ + @BINDLIBISCCFGDIR@/libisccfg.a \ + @BINDLIBISCDIR@/libisc.a man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) |