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 /relay | |
| parent | b13b616bb7a1e71e330abbd52e61efd0b98bcd8f (diff) | |
| download | isc-dhcp-e94e7f2380bc96bfe237b347e97aa85d0722bf61.tar.gz | |
Finished rebased
Diffstat (limited to 'relay')
| -rw-r--r-- | relay/Makefile.am | 8 | ||||
| -rw-r--r-- | relay/Makefile.in | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/relay/Makefile.am b/relay/Makefile.am index 3060eca4..0403426e 100644 --- a/relay/Makefile.am +++ b/relay/Makefile.am @@ -1,12 +1,12 @@ -BINDLIBDIR = @BINDDIR@/lib - AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a + @BINDLIBIRSDIR@/libirs.a \ + @BINDLIBDNSDIR@/libdns.a \ + @BINDLIBISCCFGDIR@/libisccfg.a \ + @BINDLIBISCDIR@/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/relay/Makefile.in b/relay/Makefile.in index bfacfc05..d46b27d8 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 \ - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a + @BINDLIBIRSDIR@/libirs.a @BINDLIBDNSDIR@/libdns.a \ + @BINDLIBISCCFGDIR@/libisccfg.a @BINDLIBISCDIR@/libisc.a AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -205,7 +205,13 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BINDCONFIG = @BINDCONFIG@ BINDDIR = @BINDDIR@ +BINDIOMUX = @BINDIOMUX@ +BINDLIBDNSDIR = @BINDLIBDNSDIR@ +BINDLIBIRSDIR = @BINDLIBIRSDIR@ +BINDLIBISCCFGDIR = @BINDLIBISCCFGDIR@ +BINDLIBISCDIR = @BINDLIBISCDIR@ BINDSRCDIR = @BINDSRCDIR@ +BINDSUBDIR = @BINDSUBDIR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -302,12 +308,13 @@ 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 \ - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a + @BINDLIBIRSDIR@/libirs.a \ + @BINDLIBDNSDIR@/libdns.a \ + @BINDLIBISCCFGDIR@/libisccfg.a \ + @BINDLIBISCDIR@/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) |