Commit a7ff733e authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Revert "automake: complete the removal of the target package" 

This reverts commit 6c33512e.

We DO need to look in the staging directory for .m4 files installed by other
target packages, otherwise we'll have breakage like:

http://autobuild.buildroot.net/results/b20/b20e3efcb0be3032781d7b2f0ef4c351834da0ce/



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 8404d8c2

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)"
 
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)"

package/automake/automake.mk

+2 −1
Original line number Diff line number Diff line
@@ -28,5 +28,6 @@ $(eval $(host-autotools-package)) 


# variables used by other packages

AUTOMAKE = $(HOST_DIR)/usr/bin/automake

ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal

ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal

ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal

ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)