less: update ALTERNATIVES 12472/head
authorHuangbin Zhan <zhanhb88@gmail.com>
Tue, 9 Jun 2020 22:37:36 +0000 (06:37 +0800)
committerHuangbin Zhan <zhanhb88@gmail.com>
Wed, 10 Jun 2020 02:53:27 +0000 (10:53 +0800)
Avoid conflict with busybox

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
(cherry picked from commit d866393)

utils/less/Makefile

index 6d4095073e00976c0f6dde0065f597db0f6bdd8b..6e6c12fba5e50aad322467bd8c949d357025180a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=less
 PKG_VERSION:=530
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 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))