Commit 6c33512e authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Peter Korsgaard
Browse files

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: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2f0037fd

package/autoconf/autoconf.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)"

package/automake/automake.mk

+1 −2
Original line number Diff line number Diff line
@@ -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)