diff --git a/tools/automake/Makefile b/tools/automake/Makefile index ff0f9b216..ee7966aee 100644 --- a/tools/automake/Makefile +++ b/tools/automake/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=automake -PKG_VERSION:=1.10 +PKG_VERSION:=1.11.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/automake -PKG_MD5SUM:= +PKG_MD5SUM:=c2972c4d9b3e29c03d5f2af86249876f include $(INCLUDE_DIR)/host-build.mk @@ -29,8 +29,10 @@ 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 -f $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10 + ln -sf $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9 + ln -sf $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10 + ln -sf $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11 + ln -sf $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.1 endef define Host/Clean diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch index e5f2d004b..c049b835d 100644 --- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch +++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch @@ -1,6 +1,6 @@ --- a/aclocal.in +++ b/aclocal.in -@@ -295,6 +295,12 @@ sub scan_m4_dirs ($@) +@@ -309,6 +309,12 @@ sub scan_m4_dirs ($@) foreach my $m4dir (@dirlist) {