summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-13 01:44:28 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-13 01:44:28 +0000
commitf42a033097dec43b53fc08b40c1fcc1c2515b064 (patch)
treedb2b06d1dc929ed9a1cf1027f560a650a40f2527
parent18a076fccdba90cd7bea1dd4cff1b6b0559b75f0 (diff)
[include] autotools.mk: support autoreconf at different paths, introduce PKG_AUTOMAKE_PATHS which defaults to '.'
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24534 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/autotools.mk23
1 files changed, 13 insertions, 10 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 32b512e26..4a7c10bf8 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -6,6 +6,7 @@
#
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
+PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
PKG_REMOVE_FILES?=aclocal.m4
autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
@@ -19,16 +20,18 @@ endef
define autoreconf
(cd $(PKG_BUILD_DIR); \
$(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \
- if [ -x ./autogen.sh ]; then \
- ./autogen.sh || true; \
- elif [ -f ./configure.ac ] || [ -f ./configure.in ]; then \
- [ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
- [ -d ./autom4te.cache ] && rm -rf autom4te.cache; \
- $(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; \
- fi \
+ $(foreach p,$(PKG_AUTOMAKE_PATHS), \
+ if [ -x $(p)/autogen.sh ]; then \
+ $(p)/autogen.sh || true; \
+ elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
+ [ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
+ [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
+ $(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; \
+ fi; \
+ ) \
);
endef