summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2015-04-17 19:45:51 +0200
committerFrancis Dupont <fdupont@isc.org>2015-04-17 19:45:51 +0200
commit5a428b2edf6b7d2e7d6dcdad1fc0bb17868817f2 (patch)
treed2ed5818e1b747b690af20c46c76588ae52ba10e /common
parent6e5bb0ee22874edaa829f879a0faa15d1ca6bc93 (diff)
downloadisc-dhcp-5a428b2edf6b7d2e7d6dcdad1fc0bb17868817f2.tar.gz
regen
Diffstat (limited to 'common')
-rw-r--r--common/Makefile.in3
-rw-r--r--common/tests/Makefile.in4
2 files changed, 5 insertions, 2 deletions
diff --git a/common/Makefile.in b/common/Makefile.in
index b176b7df..dff400fd 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -248,6 +248,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BINDCONFIG = @BINDCONFIG@
BINDDIR = @BINDDIR@
+BINDSRCDIR = @BINDSRCDIR@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -341,7 +342,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
AM_CFLAGS = $(LDAP_CFLAGS)
noinst_LIBRARIES = libdhcp.a
libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index d373d29c..d91d8136 100644
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -252,6 +252,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BINDCONFIG = @BINDCONFIG@
BINDDIR = @BINDDIR@
+BINDSRCDIR = @BINDSRCDIR@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -744,7 +745,8 @@ uninstall-am:
@HAVE_ATF_TRUE@check: $(ATF_TESTS)
-@HAVE_ATF_TRUE@ sh ${top_srcdir}/tests/unittest.sh
+@HAVE_ATF_TRUE@ -cp -n $(top_srcdir)/common/tests/Atffile Atffile
+@HAVE_ATF_TRUE@ sh ${top_builddir}/tests/unittest.sh
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.