From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 8 Dec 2010 15:55:05 +0000 (+0000)
Subject: autotools.mk: introduce PKG_REMOVE_FILES to delete certain files after applying patch... 
X-Git-Tag: reboot~18156
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=6541593b34822f528ff0e1ccd04eb42b51c599c6

autotools.mk: introduce PKG_REMOVE_FILES to delete certain files after applying patches and before doing any fixups

SVN-Revision: 24348
---

diff --git a/include/autotools.mk b/include/autotools.mk
index a1a5d5d815..b236aace48 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -17,11 +17,13 @@ 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 \
-			rm -f ./GNUmakefile; \
+			[ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
 			$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+				-B $(STAGING_DIR)/host/share/aclocal \
 				$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
 		fi \
 	);