[Buildroot] [git commit] automake: complete the removal of the target package

Peter Korsgaard peter at korsgaard.com
Mon Feb 2 22:38:10 UTC 2015


commit: http://git.buildroot.net/buildroot/commit/?id=6c33512e01acfc576dc4e3ad28def8b29c0db822
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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 at gmail.com>
Reviewed-by: Romain Naour <romain.naour at openwide.fr>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/autoconf/autoconf.mk |    2 +-
 package/automake/automake.mk |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index fd91961..2c0ff30 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 a3fd18c..5021b49 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)


More information about the buildroot mailing list