aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2008-10-08 21:50:03 +0000
committerLars-Peter Clausen <lars@metafoo.de>2008-10-08 21:50:03 +0000
commit5bcefcc4b56c3f1855cc0772818badfe91e9154d (patch)
treea685819eb4207baf4f382a1db3c4d42e74082313
parentf82b9c2d6f310c20a1b10d4dc77174223ba30055 (diff)
downloadupstream-5bcefcc4b56c3f1855cc0772818badfe91e9154d.tar.gz
upstream-5bcefcc4b56c3f1855cc0772818badfe91e9154d.tar.bz2
upstream-5bcefcc4b56c3f1855cc0772818badfe91e9154d.zip
Add wrapper around aclocal which also search in the targets staging dir aclocal
folder for m4 files. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12929 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--tools/automake/Makefile5
-rwxr-xr-xtools/automake/files/aclocal5
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index cf39cbda8b..2b8a6f3450 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -1,4 +1,4 @@
-#
+#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@ -27,6 +27,9 @@ endef
define Build/Install
$(MAKE) -C $(PKG_BUILD_DIR) install
+ mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
+ $(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
+ ln -f $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
endef
define Build/Clean
diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
new file mode 100755
index 0000000000..a586ccc61f
--- /dev/null
+++ b/tools/automake/files/aclocal
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+aclocal.real \
+ -I ${STAGING_DIR}/host/share/aclocal \
+ -I ${STAGING_DIR}/usr/share/aclocal \
+ $@