aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-22 22:05:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-22 22:05:55 +0000
commit63129f9b4c90013989b7e4bd5689b558dd218d27 (patch)
tree68007520eb00ed2d6ba4930a036467db95e98cc9 /tools
parentbb0448739c43cec63134dca8e4fca3d28444e12e (diff)
downloadupstream-63129f9b4c90013989b7e4bd5689b558dd218d27.tar.gz
upstream-63129f9b4c90013989b7e4bd5689b558dd218d27.tar.bz2
upstream-63129f9b4c90013989b7e4bd5689b558dd218d27.zip
clean up automake/pkg-config handling, move separate host/package variable exports to templates, fix automake path for host builds
SVN-Revision: 15339
Diffstat (limited to 'tools')
-rwxr-xr-xtools/automake/files/aclocal10
-rwxr-xr-xtools/pkg-config/files/pkg-config2
2 files changed, 2 insertions, 10 deletions
diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index 60278e2ab0..a60df10c42 100755
--- a/tools/automake/files/aclocal
+++ b/tools/automake/files/aclocal
@@ -1,10 +1,2 @@
#!/usr/bin/env sh
-if [ -d ${STAGING_DIR}/host/share/aclocal ]; then
- aclocal_include_dirs="-I ${STAGING_DIR}/host/share/aclocal"
-else
- aclocal_include_dirs=
-fi
-if [ -d ${STAGING_DIR}/usr/share/aclocal ]; then
- aclocal_include_dirs="$aclocal_include_dirs -I ${STAGING_DIR}/usr/share/aclocal"
-fi
-aclocal.real $aclocal_include_dirs $@
+aclocal.real $ACLOCAL_INCLUDE $@
diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config
index a3d73700f9..8e017fb45b 100755
--- a/tools/pkg-config/files/pkg-config
+++ b/tools/pkg-config/files/pkg-config
@@ -1,3 +1,3 @@
#!/bin/sh
-pkg-config.real $@ --define-variable=prefix=${STAGING_DIR}/usr/ --define-variable=exec_prefix=${STAGING_DIR}/usr/
+pkg-config.real $@ --define-variable=prefix=${STAGING_PREFIX}/ --define-variable=exec_prefix=${STAGING_PREFIX}/