openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-07-12 22:44:49 +04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
A more proper fix follows this revert.

This reverts commit c820f097e0.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
Link: https://github.com/openwrt/openwrt/pull/24136
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Michael Pratt
2026-07-02 20:14:51 -04:00
committed by Robert Marko
parent 773a46cc7e
commit cda598a595
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/gnulib/Makefile
+1 -6
View File
@@ -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