autotools.mk: support autoreconf at different paths, introduce PKG_AUTOMAKE_PATHS which defaults to '.'
SVN-Revision: 24534
This commit is contained in:
parent
9f47e80bb3
commit
c48a705702
1 changed files with 13 additions and 10 deletions
|
@ -6,6 +6,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
|
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
|
||||||
|
PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
|
||||||
PKG_REMOVE_FILES?=aclocal.m4
|
PKG_REMOVE_FILES?=aclocal.m4
|
||||||
|
|
||||||
autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
|
autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
|
||||||
|
@ -19,16 +20,18 @@ endef
|
||||||
define autoreconf
|
define autoreconf
|
||||||
(cd $(PKG_BUILD_DIR); \
|
(cd $(PKG_BUILD_DIR); \
|
||||||
$(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \
|
$(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \
|
||||||
if [ -x ./autogen.sh ]; then \
|
$(foreach p,$(PKG_AUTOMAKE_PATHS), \
|
||||||
./autogen.sh || true; \
|
if [ -x $(p)/autogen.sh ]; then \
|
||||||
elif [ -f ./configure.ac ] || [ -f ./configure.in ]; then \
|
$(p)/autogen.sh || true; \
|
||||||
[ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
|
elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
|
||||||
[ -d ./autom4te.cache ] && rm -rf autom4te.cache; \
|
[ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
|
||||||
$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
|
[ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
|
||||||
-B $(STAGING_DIR_HOST)/share/aclocal \
|
$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
|
||||||
-B $(STAGING_DIR)/host/share/aclocal \
|
-B $(STAGING_DIR_HOST)/share/aclocal \
|
||||||
$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
|
-B $(STAGING_DIR)/host/share/aclocal \
|
||||||
fi \
|
$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
|
||||||
|
fi; \
|
||||||
|
) \
|
||||||
);
|
);
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue