From d8663931ddb24e89ff9919aafa9d65813e9bc268 Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Wed, 10 Jun 2020 06:37:36 +0800 Subject: [PATCH] less: update ALTERNATIVES Avoid conflict with busybox Closes #11960 Signed-off-by: Huangbin Zhan --- utils/less/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/less/Makefile b/utils/less/Makefile index 80a4c27dc6..ef0cfa9160 100644 --- a/utils/less/Makefile +++ b/utils/less/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=less PKG_VERSION:=562 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less @@ -30,7 +30,7 @@ define Package/less/Default CATEGORY:=Utilities TITLE:=Pager program similar to more URL:=http://www.greenwoodsoftware.com/less/ - ALTERNATIVES:=200:/bin/less:/usr/bin/less + ALTERNATIVES:=200:/usr/bin/less:/usr/bin/gnu-less endef define Package/less/Default/description @@ -71,12 +71,10 @@ endif define Package/less/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/less $(1)/usr/bin/less + $(CP) $(PKG_INSTALL_DIR)/usr/bin/less $(1)/usr/bin/gnu-less endef Package/less-wide/install = $(Package/less/install) -Package/less-wide/postinst = $(Package/less/postinst) -Package/less-wide/postrm = $(Package/less/postrm) $(eval $(call BuildPackage,less)) $(eval $(call BuildPackage,less-wide)) -- 2.30.2