d255b67972
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct: configure.ac: AC_CONFIG_MACRO_DIR([m4]) Makefile.am: ACLOCAL_AMFLAGS="-I m4" If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663 Don't use the "-I" option in aclocal. Instead use ACLOCAL_PATH to pass the system-wide include dirs. As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the ACLOCAL_HOST_DIR system include path. autoreconf will pass the "-I" options to every tool it runs, of which aclocal, which, as seen above, we don't want. So move the argument down to each individual tool, except for aclocal. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> [yann.morin.1998@free.fr: slight rewording of the commit log] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
38 lines
1 KiB
Makefile
38 lines
1 KiB
Makefile
################################################################################
|
|
#
|
|
# automake
|
|
#
|
|
################################################################################
|
|
|
|
AUTOMAKE_VERSION = 1.15.1
|
|
AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
|
|
AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
|
|
AUTOMAKE_LICENSE = GPL-2.0+
|
|
AUTOMAKE_LICENSE_FILES = COPYING
|
|
|
|
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
|
|
|
|
ACLOCAL_HOST_DIR = $(HOST_DIR)/share/aclocal
|
|
|
|
define GTK_DOC_M4_INSTALL
|
|
$(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
|
|
$(ACLOCAL_HOST_DIR)/gtk-doc.m4
|
|
endef
|
|
|
|
# ensure staging aclocal dir exists
|
|
define HOST_AUTOMAKE_MAKE_ACLOCAL
|
|
mkdir -p $(ACLOCAL_DIR)
|
|
endef
|
|
|
|
HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
|
|
HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
|
|
|
|
$(eval $(host-autotools-package))
|
|
|
|
# variables used by other packages
|
|
AUTOMAKE = $(HOST_DIR)/bin/automake
|
|
ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
|
|
ACLOCAL = $(HOST_DIR)/bin/aclocal
|
|
ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)
|
|
export ACLOCAL_PATH
|