[openwrt/openwrt] tools/automake: clean up build recipes
LEDE Commits
lede-commits at lists.infradead.org
Mon Mar 13 14:59:07 PDT 2023
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8d0ff17ec9907b1383644793884c2b50598aafea
commit 8d0ff17ec9907b1383644793884c2b50598aafea
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Sep 7 10:45:43 2022 -0400
tools/automake: clean up build recipes
The configure option datarootdir
defaults to PREFIX/share.
The Host/Clean define should be Host/Uninstall
otherwise it is removing the build directory
before there is a chance to try "make uninstall"
in that directory.
Host/Clean/Default is no longer defined.
Consolidate the install stage with Host/Uninstall,
since it is essentially uninstalling before installing.
Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
tools/automake/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 85ccc0ded4..3a05cc90f8 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -17,7 +17,6 @@ PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += \
- --datarootdir=$(STAGING_DIR_HOST)/share \
--disable-silent-rules
HOST_CONFIGURE_VARS += \
@@ -31,9 +30,8 @@ endef
define Host/Install
# remove old automake resources to avoid version conflicts
- rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*
- rm -rf $(STAGING_DIR_HOST)/share/automake-[0-9]*
- $(MAKE) -C $(HOST_BUILD_DIR) install
+ $(call Host/Uninstall)
+ $(call Host/Compile/Default,install)
mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
@@ -45,6 +43,8 @@ endef
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
+ rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*
+ rm -rf $(STAGING_DIR_HOST)/share/automake-[0-9]*
endef
$(eval $(call HostBuild))
More information about the lede-commits
mailing list