91 lines
3.5 KiB
Diff
91 lines
3.5 KiB
Diff
Fix out of tree builds
|
|
|
|
Upstream-Status: Pending
|
|
|
|
RP 2013/03/21
|
|
|
|
Index: dhcp-4.2.5/common/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000
|
|
+++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000
|
|
@@ -1,4 +1,4 @@
|
|
-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
|
|
AM_CFLAGS = $(LDAP_CFLAGS)
|
|
|
|
noinst_LIBRARIES = libdhcp.a
|
|
Index: dhcp-4.2.5/dst/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000
|
|
+++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000
|
|
@@ -1,4 +1,4 @@
|
|
-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
|
|
+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
|
|
|
|
lib_LIBRARIES = libdst.a
|
|
|
|
Index: dhcp-4.2.5/omapip/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000
|
|
+++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000
|
|
@@ -1,3 +1,5 @@
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/includes
|
|
+
|
|
lib_LIBRARIES = libomapi.a
|
|
noinst_PROGRAMS = svtest
|
|
|
|
Index: dhcp-4.2.5/client/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000
|
|
+++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000
|
|
@@ -1,3 +1,5 @@
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/includes
|
|
+
|
|
dist_sysconf_DATA = dhclient.conf.example
|
|
sbin_PROGRAMS = dhclient
|
|
dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
|
|
@@ -11,8 +13,8 @@
|
|
|
|
dhclient.o: dhclient.c
|
|
$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
|
|
- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c
|
|
+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c
|
|
|
|
dhc6.o: dhc6.c
|
|
$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
|
|
- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
|
|
+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c
|
|
Index: dhcp-4.2.5/dhcpctl/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000
|
|
+++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000
|
|
@@ -1,3 +1,5 @@
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
|
|
+
|
|
bin_PROGRAMS = omshell
|
|
lib_LIBRARIES = libdhcpctl.a
|
|
noinst_PROGRAMS = cltest
|
|
Index: dhcp-4.2.5/relay/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000
|
|
+++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000
|
|
@@ -1,4 +1,4 @@
|
|
-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
|
|
+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
|
|
|
|
sbin_PROGRAMS = dhcrelay
|
|
dhcrelay_SOURCES = dhcrelay.c
|
|
Index: dhcp-4.2.5/server/Makefile.am
|
|
===================================================================
|
|
--- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000
|
|
+++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000
|
|
@@ -4,7 +4,7 @@
|
|
# production code. Sadly, we are not there yet.
|
|
SUBDIRS = . tests
|
|
|
|
-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
|
|
+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
|
|
|
|
dist_sysconf_DATA = dhcpd.conf.example
|
|
sbin_PROGRAMS = dhcpd
|