aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Fabio Porcedda <fabio.porcedda@gmail.com>2015-02-01 17:51:39 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-02-02 23:38:10 +0100
commit6c33512e01acfc576dc4e3ad28def8b29c0db822 (patch)
tree0421f8ca948e9562d0bc723096cfc8b23ddddcfd /package
parent2f0037fd9f52bfa26de5ed76c4fa7045fabb95d9 (diff)
downloadbuildroot-6c33512e01acfc576dc4e3ad28def8b29c0db822.tar.gz
buildroot-6c33512e01acfc576dc4e3ad28def8b29c0db822.tar.bz2
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 <fabio.porcedda@gmail.com> Reviewed-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package')
-rw-r--r--package/autoconf/autoconf.mk2
-rw-r--r--package/automake/automake.mk3
2 files changed, 2 insertions, 3 deletions
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)