]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
Revert "tools: gnulib: fix broken install of .m4 files"
authorMichael Pratt <mcpratt@pm.me>
Fri, 3 Jul 2026 00:14:39 +0000 (20:14 -0400)
committerRobert Marko <robimarko@gmail.com>
Sun, 12 Jul 2026 09:26:52 +0000 (11:26 +0200)
A more proper fix follows these reverts.

This reverts commit 78a8cfb57772138ff5b925b9d69928e5878931bf.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
Link: https://github.com/openwrt/openwrt/pull/24136
Signed-off-by: Robert Marko <robimarko@gmail.com>
tools/gnulib/Makefile

index 0b28d73d134b5589b47e04791edb1ced84ca3ece..018ff5db14c2b63b4a715c5c55d1acccde027c62 100644 (file)
@@ -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