Changeset 30720 for packages


Ignore:
Timestamp:
2012-02-25T15:54:58+01:00 (5 years ago)
Author:
jow
Message:

[packages] less: fix clash with Busybox (#11042)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/less/Makefile

    r25229 r30720  
    11# 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=less 
    1111PKG_VERSION:=436 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    3131 
    3232define Package/less/install 
    33         $(INSTALL_DIR) $(1)/usr/bin 
    34         $(CP) $(PKG_BUILD_DIR)/less $(1)/usr/bin/less 
     33        $(INSTALL_DIR) $(1)/bin 
     34        $(CP) $(PKG_BUILD_DIR)/less $(1)/bin/less 
     35endef 
     36 
     37define Package/less/postinst 
     38#!/bin/sh 
     39[ -L "$${IPKG_INSTROOT}/usr/bin/less" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/less" 
     40exit 0 
     41endef 
     42 
     43define Package/less/postrm 
     44#!/bin/sh 
     45/bin/busybox less -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/less 
     46exit 0 
    3547endef 
    3648 
Note: See TracChangeset for help on using the changeset viewer.