Changeset d419478 in freewrt for package/less/Makefile


Ignore:
Timestamp:
Jul 21, 2006, 1:56:32 AM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
50d34d3
Parents:
2029b2e
Message:
  • whitespace cleanup, while here
  • move WRKDIR and DISTFILES definition into PKG_template
  • define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
  • use a sub-directory as WRKDIR, like BSD
  • rename PKG_BUILD_DIR into WRKBUILD
  • define WRKBUILD relative via WRKDIR
  • rename PKG_INSTALL_DIR into WRKINST
  • fix a few dependencies
  • make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
  • use WRKDIR instead of BUILD_DIR in places where the latter was used previously
  • while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • package/less/Makefile

    r2029b2e rd419478  
    1010PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less
    1111PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
    12 PKG_CAT:=zcat
    1312
    14 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    15 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
    1613
    1714include $(TOPDIR)/package/rules.mk
     
    1916$(eval $(call PKG_template,LESS,less,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    2017
    21 $(PKG_BUILD_DIR)/.configured:
    22         (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
     18$(WRKBUILD)/.configured:
     19        (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
    2320                $(TARGET_CONFIGURE_OPTS) \
    2421                CFLAGS="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
     
    5148        touch $@
    5249
    53 $(PKG_BUILD_DIR)/.built:
    54         $(MAKE) -C $(PKG_BUILD_DIR)
     50$(WRKBUILD)/.built:
     51        $(MAKE) -C $(WRKBUILD)
    5552        touch $@
    5653
    5754$(IPKG_LESS):
    5855        install -d -m0755 $(IDIR_LESS)/usr/bin
    59         install -m0755 $(PKG_BUILD_DIR)/less $(IDIR_LESS)/usr/bin/
     56        install -m0755 $(WRKBUILD)/less $(IDIR_LESS)/usr/bin/
    6057        $(RSTRIP) $(IDIR_LESS)
    6158        $(IPKG_BUILD) $(IDIR_LESS) $(PACKAGE_DIR)
Note: See TracChangeset for help on using the changeset viewer.