From: Fabio Porcedda Date: Sun, 1 Feb 2015 16:51:39 +0000 (+0100) Subject: automake: complete the removal of the target package X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c33512e01acfc576dc4e3ad28def8b29c0db822;p=buildroot.git automake: complete the removal of the target package The variable ACLOCAL_DIR points to the staging area but is not useful anymore because the target package was removed. Fix ACLOCAL_DIR by pointing to $(HOST_DIR)/usr/share/aclocal and remove ACLOCAL_HOST_DIR because ACLOCAL_DIR has the same value so it's not useful anymore. Also remove the reference to ACLOCAL_HOST_DIR from the host-autoconf package. Signed-off-by: Fabio Porcedda Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index fd91961e85..2c0ff30eff 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -23,4 +23,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOCONF = $(HOST_DIR)/usr/bin/autoconf AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" diff --git a/package/automake/automake.mk b/package/automake/automake.mk index a3fd18cd13..5021b494b9 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -28,6 +28,5 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/usr/bin/automake -ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal +ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)