aboutsummaryrefslogtreecommitdiffstats
path: root/tools/automake
diff options
context:
space:
mode:
authorMichael Pratt <mcpratt@pm.me>2022-09-07 10:45:43 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-13 22:53:41 +0100
commit8d0ff17ec9907b1383644793884c2b50598aafea (patch)
tree1937e41e4f4a5caeb91e9bbf87e39819813a425f /tools/automake
parent99ed71faec745ced91a00d46c6512b27c9892d2b (diff)
downloadupstream-8d0ff17ec9907b1383644793884c2b50598aafea.tar.gz
upstream-8d0ff17ec9907b1383644793884c2b50598aafea.tar.bz2
upstream-8d0ff17ec9907b1383644793884c2b50598aafea.zip
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@pm.me>
Diffstat (limited to 'tools/automake')
-rw-r--r--tools/automake/Makefile8
1 files 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))