From: Michael Pratt Date: Fri, 3 Jul 2026 00:14:39 +0000 (-0400) Subject: Revert "tools: gnulib: fix broken install of .m4 files" X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=773a46cc7ea3bf9b356c4d415850a09abd97cdb8;p=thirdparty%2Fopenwrt.git Revert "tools: gnulib: fix broken install of .m4 files" A more proper fix follows these reverts. This reverts commit 78a8cfb57772138ff5b925b9d69928e5878931bf. Signed-off-by: Michael Pratt Link: https://github.com/openwrt/openwrt/pull/24136 Signed-off-by: Robert Marko --- diff --git a/tools/gnulib/Makefile b/tools/gnulib/Makefile index 0b28d73d134..018ff5db14c 100644 --- a/tools/gnulib/Makefile +++ b/tools/gnulib/Makefile @@ -20,10 +20,8 @@ endef define Host/Install $(call Host/Uninstall) $(INSTALL_DIR) $(1)/share/aclocal - for m4 in $(HOST_BUILD_DIR)/m4/*.m4; do \ - $(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/$$$$(basename $$$$m4) \ - $(1)/share/aclocal/gl_$$$$(basename $$$$m4); \ - done + $(foreach m4,$(notdir $(wildcard $(HOST_BUILD_DIR)/m4/*.m4)), + $(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/$(m4) $(1)/share/aclocal/gl_$(m4)) $(CP) $(HOST_BUILD_DIR)/ $(1)/share/gnulib/ ln -sf ../share/gnulib/gnulib-tool $(STAGING_DIR_HOST)/bin/gnulib-tool endef