From fc02216ab2a96fdf6a5375d2ffbd5e5be25f7b6a Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Sat, 21 Nov 2020 16:59:59 +0800 Subject: [PATCH] xz: move alternatives to /usr/libexec Signed-off-by: Huangbin Zhan --- utils/xz/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/xz/Makefile b/utils/xz/Makefile index ca3e2c5ffb..5fb7f83fca 100644 --- a/utils/xz/Makefile +++ b/utils/xz/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz PKG_VERSION:=5.2.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/lzmautils @@ -56,7 +56,7 @@ define BuildSubPackage $(call Package/xz/Default) DEPENDS:=xz-utils $(2) TITLE:=$(1) utility from XZ Utils - $(if $(3),ALTERNATIVES:=$(foreach f,$(1) $(3),300:/usr/bin/$(f):/usr/bin/lzmautils-$(1))) + $(if $(3),ALTERNATIVES:=$(foreach f,$(1) $(3),300:/usr/bin/$(f):/usr/libexec/$(1)-lzmautils)) endef define Package/$(1)/description @@ -64,8 +64,8 @@ define BuildSubPackage endef define Package/$(1)/install - $(INSTALL_DIR) $$(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/$(if $(3),lzmautils-$(1)) + $(INSTALL_DIR) $$(1)$(if $(3),/usr/libexec,/usr/bin) + $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)$(if $(3),/usr/libexec/$(1)-lzmautils,/usr/bin/$(1)) endef $$(eval $$(call BuildPackage,$(1)))