Revert "tools: gnulib: install .m4 file with gl_ prefix"

A more proper fix follows this revert.

This reverts commit c820f097e0bede3ec09c62ca9608d915da21e62d.

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

diff --git a/tools/gnulib/Makefile b/tools/gnulib/Makefile
index 018ff5db14c2b63b4a715c5c55d1acccde027c62..1237fad46e1776fb22eecc2c7a68bf065ae04457 100644 (file)
--- a/tools/gnulib/Makefile
+++ b/tools/gnulib/Makefile
@@ -13,15 +13,10 @@ include $(INCLUDE_DIR)/host-build.mk
 define Host/Configure
 endef
 
-# On installing the .m4 files, we add a gl_ prefix to prevent any conflict with
-# automake. It was found that there is currently a conflict for the cond.m4 that
-# is also shipped by automake, making the gnulib one having priority causing
-# problem with finding AM_CONDITIONAL macro.
 define Host/Install
        $(call Host/Uninstall)
        $(INSTALL_DIR) $(1)/share/aclocal
-       $(foreach m4,$(notdir $(wildcard $(HOST_BUILD_DIR)/m4/*.m4)),
-               $(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/$(m4) $(1)/share/aclocal/gl_$(m4))
+       $(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/*.m4 $(1)/share/aclocal/
        $(CP) $(HOST_BUILD_DIR)/ $(1)/share/gnulib/
        ln -sf ../share/gnulib/gnulib-tool $(STAGING_DIR_HOST)/bin/gnulib-tool
 endef