X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e419e3e062024fbcf05480b27b6cdaac440816d9..9bdc5b83af7884b197848834833f8751baaed7f9:/include/autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index 9ba3fc33b..e4c9fedba 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -17,10 +17,14 @@ 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 \
 				$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
 		fi \
 	);
@@ -42,3 +46,8 @@ ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
  endif
 endif
 
+ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
+  ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),)
+    Hooks/Configure/Pre += autoreconf
+  endif
+endif