Commit 65b3cda9 authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Peter Korsgaard
Browse files

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: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 6c33512e

package/automake/automake.mk

+4 −2
Original line number Diff line number Diff line
@@ -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)