[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / tools / automake / Makefile

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index cf39cbd..cd25847 100644 (file)
--- 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.
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.


@@ -15,24 +15,26 @@ PKG_MD5SUM:=c11b8100bb311492d8220378fd8bf9e0
 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 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
 
                --datarootdir=$(STAGING_DIR_HOST)/share \
        )
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+       $(MAKE) -C $(HOST_BUILD_DIR)

 endef
 
 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
 
 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
+       $(call Host/Clean/Default)

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))