Revert "automake: use whenever possible the ACLOCAL_DIR variable"

This reverts commit 65b3cda915.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2015-02-03 00:39:22 +01:00
parent 0df309a3e8
commit 8404d8c295

View File

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