From mboxrd@z Thu Jan  1 00:00:00 1970
From: Romain Naour <romain.naour@openwide.fr>
Date: Sun, 01 Feb 2015 22:52:31 +0100
Subject: [Buildroot] [PATCH 2/2] automake: use whenever possible the
 ACLOCAL_DIR variable
In-Reply-To: <1422809500-23948-2-git-send-email-fabio.porcedda@gmail.com>
References: <1422809500-23948-1-git-send-email-fabio.porcedda@gmail.com>
 <1422809500-23948-2-git-send-email-fabio.porcedda@gmail.com>
Message-ID: <54CEA01F.5010500@openwide.fr>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Hi Fabio,

Le 01/02/2015 17:51, Fabio Porcedda a ?crit :
> 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>
> ---
>  package/automake/automake.mk | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/automake/automake.mk b/package/automake/automake.mk
> index 5021b49..264cbad 100644
> --- a/package/automake/automake.mk
> +++ b/package/automake/automake.mk
> @@ -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)
> 

Reviewed-by: Romain Naour <romain.naour@openwide.fr>

Best regards,
Romain Naour