X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fautomake%2FMakefile;h=63d28bd48b258512ed08d42cd954b1055311b7cd;hb=764d161752ec7b2b55b49081b3d25b11e7eba308;hp=679a954218258615ceccbaa5e8f4343f4d541ba8;hpb=800e84cc0ff36cfbc254ec9681d8731a4fd480f1;p=openwrt.git

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 679a954218..63d28bd48b 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,34 +7,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automake
-PKG_VERSION:=1.9.6
+PKG_VERSION:=1.11.3
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/automake
-PKG_MD5SUM:=c11b8100bb311492d8220378fd8bf9e0
+PKG_MD5SUM:=3d72b2076eb4397ad5e9a2aace6357fd
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Configure
-	$(call Host/Configure/Default,\
-		--datarootdir=$(STAGING_DIR_HOST)/share \
-	)
-endef
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
+HOST_CONFIGURE_ARGS += --datarootdir=$(STAGING_DIR_HOST)/share
+HOST_CONFIGURE_VARS += am_cv_prog_PERL_ithreads=no
 
 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
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
+	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.1
 endef
 
 define Host/Clean
-	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	$(MAKE) -C $(HOST_BUILD_DIR) clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
 	$(call Host/Clean/Default)
 endef