summaryrefslogtreecommitdiffstats
path: root/tools/automake
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-22 22:05:55 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-22 22:05:55 +0000
commitaa1fa7f74a6706801583cd097b114f01c5904b92 (patch)
tree87557961215529ecd3a03b6908eb418be99df362 /tools/automake
parent9b892db4e7dc99ef513caa72826f67a4a8d731f9 (diff)
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 60278e2ab..a60df10c4 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 $@