From eb3e03b7447d74ca6cb00f14e1ec0eed74e20ab4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 23 Dec 2025 19:10:10 +0100 Subject: [PATCH] package/vim: refactor install target logic Instead of calling $(MAKE) multiple times, let's call it once, with all installation targets needed. We introduce a VIM_INSTALL_TARGETS variable to collect the list of make install targets that need to be invoked. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain (cherry picked from commit 525a234303bf19a99940954abdfa7aa51add2b94) Signed-off-by: Thomas Perale --- package/vim/vim.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 2bf01fa8bd..d250ac6b59 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -46,17 +46,18 @@ else VIM_CONF_OPTS += --disable-selinux endif +VIM_INSTALL_TARGETS = \ + installvimbin installpack \ + installtools installlinks + +ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y) +VIM_INSTALL_TARGETS += installrtbase installmacros +endif + define VIM_INSTALL_TARGET_CMDS $(RM) -f $(TARGET_DIR)/usr/bin/{ex,view,rvim,rview,vimdiff} - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installvimbin - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installpack - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installtools - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installlinks -endef - -define VIM_INSTALL_RUNTIME_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installrtbase - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) installmacros + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \ + $(VIM_INSTALL_TARGETS) endef define VIM_REMOVE_DOCS @@ -77,7 +78,6 @@ endif VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y) -VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS endif