浏览代码

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

SVN-Revision: 24348
Jo-Philipp Wich 15 年之前
父节点
当前提交
6541593b34
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      include/autotools.mk

+ 3 - 1
include/autotools.mk

@@ -17,11 +17,13 @@ endef
 
 
 define autoreconf
 define autoreconf
 	(cd $(PKG_BUILD_DIR); \
 	(cd $(PKG_BUILD_DIR); \
+		$(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \
 		if [ -x ./autogen.sh ]; then \
 		if [ -x ./autogen.sh ]; then \
 			./autogen.sh || true; \
 			./autogen.sh || true; \
 		elif [ -f ./configure.ac ] || [ -f ./configure.in ]; then \
 		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 \
 			$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+				-B $(STAGING_DIR)/host/share/aclocal \
 				$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
 				$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
 		fi \
 		fi \
 	);
 	);