From e57a3cb7f2d656644bc46d5bdd89a9199754c614 Mon Sep 17 00:00:00 2001
From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 8 Oct 2008 21:50:03 +0000
Subject: 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
---
 tools/automake/Makefile      | 5 ++++-
 tools/automake/files/aclocal | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 tools/automake/files/aclocal

(limited to 'tools/automake')

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index cf39cbda8..2b8a6f345 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 000000000..a586ccc61
--- /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 \
+    $@
-- 
cgit v1.2.3