X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=tools%2Fautomake%2FMakefile;h=679a954218258615ceccbaa5e8f4343f4d541ba8;hp=cf39cbda8bc82845b23170592e5a330bcc5e67fe;hb=800e84cc0ff36cfbc254ec9681d8731a4fd480f1;hpb=5bcb865d4c586c0122a0e92e577189338e593862

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index cf39cbda8..679a95421 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.
@@ -15,24 +15,27 @@ PKG_MD5SUM:=c11b8100bb311492d8220378fd8bf9e0
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	$(call Build/Configure/Default,\
+define Host/Configure
+	$(call Host/Configure/Default,\
 		--datarootdir=$(STAGING_DIR_HOST)/share \
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) install
+define Host/Install
+	$(MAKE) -C $(HOST_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
-	$(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Clean/Default)
+define Host/Clean
+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(MAKE) -C $(HOST_BUILD_DIR) clean
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))