automake: use whenever possible the ACLOCAL_DIR variable

Use the ACLOCAL_DIR in the GTK_DOC_M4_INSTALL hook.

Move the ACLOCAL_DIR definition at the beginning so the definition is
ahead the utilization.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabio Porcedda 2015-02-01 17:51:40 +01:00 committed by Peter Korsgaard
parent 6c33512e01
commit 65b3cda915

View File

@ -12,8 +12,11 @@ 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 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
$(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
$(ACLOCAL_DIR)/gtk-doc.m4
endef
# ensure staging aclocal dir exists
@ -28,5 +31,4 @@ $(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)