Patchwork [5/5] libpcap: fix relative path references

login
register
mail settings
Submitter Ross Burton
Date Feb. 4, 2013, 10:44 a.m.
Message ID <1359974656-21894-6-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/43983/
State Accepted
Commit a01c103f54d2f588d78756d19f879eb82d0e5ae4
Headers show

Comments

Ross Burton - Feb. 4, 2013, 10:44 a.m.
do_configure was using relative paths in do_configure with the assumption that
$S is the same as $B.  This isn't always true, so explicitly use $S.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/libpcap/libpcap.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index c87066c..b9c3640 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -27,8 +27,8 @@  CFLAGS_prepend = "-I${S} "
 CXXFLAGS_prepend = "-I${S} "
 
 do_configure_prepend () {
-    if [ ! -e acinclude.m4 ]; then
-        cat aclocal.m4 > acinclude.m4
+    if [ ! -e ${S}/acinclude.m4 ]; then
+        cat ${S}/aclocal.m4 > ${S}/acinclude.m4
     fi
     sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
 }