aboutsummaryrefslogtreecommitdiffstats
path: root/tools/automake
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
commit3195be7429507967adf0a495df28bc0d2618d1b1 (patch)
tree87557961215529ecd3a03b6908eb418be99df362 /tools/automake
parentd91cdc629196db4c044e06040ba54d59427b6c03 (diff)
downloadupstream-3195be7429507967adf0a495df28bc0d2618d1b1.tar.gz
upstream-3195be7429507967adf0a495df28bc0d2618d1b1.tar.bz2
upstream-3195be7429507967adf0a495df28bc0d2618d1b1.zip
clean up automake/pkg-config handling, move separate host/package variable exports to templates, fix automake path for host builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15339 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/automake')
-rwxr-xr-xtools/automake/files/aclocal10
1 files changed, 1 insertions, 9 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 $@