diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
| commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
| tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/libpcap | |
| parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
| parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libpcap')
| -rw-r--r-- | package/libpcap/Makefile | 2 | ||||
| -rw-r--r-- | package/libpcap/patches/patch-Makefile_in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index caacf0e8c..ebc7701ce 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-yydebug \ --with-pcap=linux TCFLAGS+= ${TCPPFLAGS} INSTALL_TARGET= install install-shared -MAKE_FLAGS+= STAGING_DIR=$(STAGING_DIR) +MAKE_FLAGS+= STAGING_TARGET_DIR=$(STAGING_TARGET_DIR) ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in index deb816cd6..d967498c3 100644 --- a/package/libpcap/patches/patch-Makefile_in +++ b/package/libpcap/patches/patch-Makefile_in @@ -6,8 +6,8 @@ @rm -f $@ $@.tmp - sed -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ -+ sed -e 's|@includedir[@]|$(STAGING_DIR)$(includedir)|g' \ -+ -e 's|@libdir[@]|$(STAGING_DIR)$(libdir)|g' \ ++ sed -e 's|@includedir[@]|$(STAGING_TARGET_DIR)$(includedir)|g' \ ++ -e 's|@libdir[@]|$(STAGING_TARGET_DIR)$(libdir)|g' \ -e 's|@LIBS[@]|$(LIBS)|g' \ -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \ $(srcdir)/pcap-config.in >$@.tmp |