Add wrapper around aclocal which also search in the targets staging dir aclocal
authorlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 8 Oct 2008 21:50:03 +0000 (21:50 +0000)
committerlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 8 Oct 2008 21:50:03 +0000 (21:50 +0000)
folder for m4 files.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12929 3c298f89-4303-0410-b956-a3cf2f4a3e73

tools/automake/Makefile
tools/automake/files/aclocal [new file with mode: 0755]

index cf39cbd..2b8a6f3 100644 (file)
@@ -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 (executable)
index 0000000..a586ccc
--- /dev/null
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+aclocal.real \
+    -I ${STAGING_DIR}/host/share/aclocal \
+    -I ${STAGING_DIR}/usr/share/aclocal \
+    $@