From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 8 Oct 2008 21:50:03 +0000 (+0000)
Subject: Add wrapper around aclocal which also search in the targets staging dir aclocal folde... 
X-Git-Tag: reboot~25429
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=1f819de60e94eab20a63012711e17116a2a9b2a0

Add wrapper around aclocal which also search in the targets staging dir aclocal folder for m4 files.

SVN-Revision: 12929
---

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 \
+    $@