summaryrefslogtreecommitdiffstats
path: root/package/automake
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-02-03 00:39:22 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-02-03 00:39:22 +0100
commit8404d8c295681207c306df0b264ddf9cefb0b219 (patch)
tree00256fccf3be39da1063e0f2dda391b7e33620b2 /package/automake
parent0df309a3e805ec0f6ccd963ce0dbb0a2934acf44 (diff)
downloadbuildroot-8404d8c295681207c306df0b264ddf9cefb0b219.tar.gz
buildroot-8404d8c295681207c306df0b264ddf9cefb0b219.zip
Revert "automake: use whenever possible the ACLOCAL_DIR variable"
This reverts commit 65b3cda915f04d1c0a108c4163ea72e459f20652. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/automake')
-rw-r--r--package/automake/automake.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 264cbadeda..5021b494b9 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -12,11 +12,8 @@ AUTOMAKE_LICENSE_FILES = COPYING
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
-ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
-
define GTK_DOC_M4_INSTALL
- $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
- $(ACLOCAL_DIR)/gtk-doc.m4
+ $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
endef
# ensure staging aclocal dir exists
@@ -31,4 +28,5 @@ $(eval $(host-autotools-package))
# variables used by other packages
AUTOMAKE = $(HOST_DIR)/usr/bin/automake
+ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
OpenPOWER on IntegriCloud