NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automake: complete the removal of the target package

Browse Source 
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>
This commit is contained in:
Fabio Porcedda 2015-02-01 17:51:39 +01:00 committed by Peter Korsgaard
parent 2f0037fd9f
commit 6c33512e01
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/autoconf/autoconf.mk
View File

@ -23,4 +23,4 @@ $(eval $(host-autotools-package))
# variables used by other packages # variables used by other packages
AUTOCONF = $(HOST_DIR)/usr/bin/autoconf AUTOCONF = $(HOST_DIR)/usr/bin/autoconf
AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader 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)"

3
package/automake/automake.mk
View File

@ -28,6 +28,5 @@ $(eval $(host-autotools-package))
# variables used by other packages # variables used by other packages
AUTOMAKE = $(HOST_DIR)/usr/bin/automake AUTOMAKE = $(HOST_DIR)/usr/bin/automake
ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR) ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)