From 8404d8c295681207c306df0b264ddf9cefb0b219 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 3 Feb 2015 00:39:22 +0100 Subject: [PATCH] Revert "automake: use whenever possible the ACLOCAL_DIR variable" This reverts commit 65b3cda915f04d1c0a108c4163ea72e459f20652. Signed-off-by: Peter Korsgaard --- package/automake/automake.mk | 6 ++---- 1 file 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) -- 2.30.2