summaryrefslogtreecommitdiff
path: root/package/automake
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-02-03 00:40:20 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-02-03 00:40:20 +0100
commita7ff733e83416bb2faa6cc4900e05f11d3ac490e (patch)
tree44fccc93c6458d0f0e60ca36981050c712793dd3 /package/automake
parent8404d8c295681207c306df0b264ddf9cefb0b219 (diff)
Revert "automake: complete the removal of the target package"
This reverts commit 6c33512e01acfc576dc4e3ad28def8b29c0db822. 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: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/automake')
-rw-r--r--package/automake/automake.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 5021b494b..a3fd18cd1 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -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)