Browse Source

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

SVN-Revision: 12929
Lars-Peter Clausen 17 years ago
parent
commit
1f819de60e
2 changed files with 9 additions and 1 deletions
  1. 4 1
      tools/automake/Makefile
  2. 5 0
      tools/automake/files/aclocal

+ 4 - 1
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

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