diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-11-17 14:55:09 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-11-17 14:55:09 +0100 |
| commit | a555d1ab9ff099e4bf278ba416188b7491f51f7f (patch) | |
| tree | a96633bd93e868f56dc99e5ef729716713191363 /relay | |
| parent | ce29e695745f3a660f0a0cd9e43b4b1c41bb8276 (diff) | |
| parent | 2830c4005906378b3f14bcb8c146a156268bc3dc (diff) | |
| download | isc-dhcp-a555d1ab9ff099e4bf278ba416188b7491f51f7f.tar.gz | |
Finished merge of rt39210 (--with-libbind fixes) (regen required)
Diffstat (limited to 'relay')
| -rw-r--r-- | relay/Makefile.am | 6 | ||||
| -rw-r--r-- | relay/Makefile.in | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/relay/Makefile.am b/relay/Makefile.am index 198d5cd6..3060eca4 100644 --- a/relay/Makefile.am +++ b/relay/Makefile.am @@ -1,10 +1,12 @@ +BINDLIBDIR = @BINDDIR@/lib + AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/relay/Makefile.in b/relay/Makefile.in index eb2632b8..27dd989d 100644 --- a/relay/Makefile.in +++ b/relay/Makefile.in @@ -104,8 +104,8 @@ PROGRAMS = $(sbin_PROGRAMS) am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT) dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS) dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -203,6 +203,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ +BINDDIR = @BINDDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -297,11 +298,12 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +BINDLIBDIR = @BINDDIR@/lib AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ + $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) |