From: Jo-Philipp Wich Date: Sat, 28 Jan 2012 03:52:25 +0000 (+0000) Subject: tools: merge r29929 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=86be382e90d2233ab8e30f927a6f5aa1344a8016;p=openwrt%2Fsvn-archive%2Fopenwrt.git tools: merge r29929 SVN-Revision: 29930 --- diff --git a/tools/automake/Makefile b/tools/automake/Makefile index ee7966aeeb..70103d5a95 100644 --- a/tools/automake/Makefile +++ b/tools/automake/Makefile @@ -29,10 +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 -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 + 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