Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 92875f5cc44914515e50c11c503a09cec90497b2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Sat, 11 Jun 2016 22:51:44 -0400 |
| 4 | Subject: [PATCH 08/11] tweak to support external bind |
| 5 | |
| 6 | Tweak the external bind to oe-core's sysroot rather than |
| 7 | external bind source build. |
| 8 | |
| 9 | Upstream-Status: Inappropriate <oe-core specific> |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | client/Makefile.am | 2 +- |
| 14 | client/tests/Makefile.am | 2 +- |
| 15 | common/tests/Makefile.am | 2 +- |
| 16 | dhcpctl/Makefile.am | 2 +- |
| 17 | omapip/Makefile.am | 2 +- |
| 18 | relay/Makefile.am | 2 +- |
| 19 | server/Makefile.am | 2 +- |
| 20 | server/tests/Makefile.am | 2 +- |
| 21 | 8 files changed, 8 insertions(+), 8 deletions(-) |
| 22 | |
| 23 | diff --git a/client/Makefile.am b/client/Makefile.am |
| 24 | index 4730bb3..84d8131 100644 |
| 25 | --- a/client/Makefile.am |
| 26 | +++ b/client/Makefile.am |
| 27 | @@ -4,7 +4,7 @@ |
| 28 | # production code. Sadly, we are not there yet. |
| 29 | SUBDIRS = . tests |
| 30 | |
| 31 | -BINDLIBDIR = @BINDDIR@/lib |
| 32 | +BINDLIBDIR = @BINDDIR@ |
| 33 | |
| 34 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 35 | -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes |
| 36 | diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am |
| 37 | index 5031d0c..a8dfd26 100644 |
| 38 | --- a/client/tests/Makefile.am |
| 39 | +++ b/client/tests/Makefile.am |
| 40 | @@ -1,6 +1,6 @@ |
| 41 | SUBDIRS = . |
| 42 | |
| 43 | -BINDLIBDIR = @BINDDIR@/lib |
| 44 | +BINDLIBDIR = @BINDDIR@ |
| 45 | |
| 46 | AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes |
| 47 | AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) |
| 48 | diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am |
| 49 | index f6a43e4..2f98d22 100644 |
| 50 | --- a/common/tests/Makefile.am |
| 51 | +++ b/common/tests/Makefile.am |
| 52 | @@ -1,6 +1,6 @@ |
| 53 | SUBDIRS = . |
| 54 | |
| 55 | -BINDLIBDIR = @BINDDIR@/lib |
| 56 | +BINDLIBDIR = @BINDDIR@ |
| 57 | |
| 58 | AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes |
| 59 | |
| 60 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
| 61 | index ba8dd8b..9b2486e 100644 |
| 62 | --- a/dhcpctl/Makefile.am |
| 63 | +++ b/dhcpctl/Makefile.am |
| 64 | @@ -1,4 +1,4 @@ |
| 65 | -BINDLIBDIR = @BINDDIR@/lib |
| 66 | +BINDLIBDIR = @BINDDIR@ |
| 67 | |
| 68 | AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| 69 | |
| 70 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 71 | index dd1afa0..e4a8599 100644 |
| 72 | --- a/omapip/Makefile.am |
| 73 | +++ b/omapip/Makefile.am |
| 74 | @@ -1,4 +1,4 @@ |
| 75 | -BINDLIBDIR = @BINDDIR@/lib |
| 76 | +BINDLIBDIR = @BINDDIR@ |
| 77 | AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 78 | |
| 79 | lib_LIBRARIES = libomapi.a |
| 80 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 81 | index 6d652f6..b3bf578 100644 |
| 82 | --- a/relay/Makefile.am |
| 83 | +++ b/relay/Makefile.am |
| 84 | @@ -1,4 +1,4 @@ |
| 85 | -BINDLIBDIR = @BINDDIR@/lib |
| 86 | +BINDLIBDIR = @BINDDIR@ |
| 87 | |
| 88 | AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 89 | |
| 90 | diff --git a/server/Makefile.am b/server/Makefile.am |
| 91 | index 3990b9c..b5d8c2d 100644 |
| 92 | --- a/server/Makefile.am |
| 93 | +++ b/server/Makefile.am |
| 94 | @@ -4,7 +4,7 @@ |
| 95 | # production code. Sadly, we are not there yet. |
| 96 | SUBDIRS = . tests |
| 97 | |
| 98 | -BINDLIBDIR = @BINDDIR@/lib |
| 99 | +BINDLIBDIR = @BINDDIR@ |
| 100 | |
| 101 | AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 102 | |
| 103 | diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am |
| 104 | index a87c5e7..9821081 100644 |
| 105 | --- a/server/tests/Makefile.am |
| 106 | +++ b/server/tests/Makefile.am |
| 107 | @@ -1,6 +1,6 @@ |
| 108 | SUBDIRS = . |
| 109 | |
| 110 | -BINDLIBDIR = @BINDDIR@/lib |
| 111 | +BINDLIBDIR = @BINDDIR@ |
| 112 | |
| 113 | AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes |
| 114 | AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) |
| 115 | -- |
| 116 | 1.8.3.1 |
| 117 | |