Changeset d419478 in freewrt for package/raddump/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/raddump/Makefile

    r2029b2e rd419478  
    99PKG_SOURCE_URL:=@SF/raddump
    1010PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
    11 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
    12 PKG_CAT:=zcat
    1311
    14 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
    1512
    1613include $(TOPDIR)/package/rules.mk
     
    1815$(eval $(call PKG_template,RADDUMP,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1916
    20 $(PKG_BUILD_DIR)/.configured:
    21         (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
     17$(WRKBUILD)/.configured:
     18        (cd $(WRKBUILD); rm -rf config.cache; \
    2219                $(TARGET_CONFIGURE_OPTS) \
    2320                CFLAGS="$(TARGET_CFLAGS)" \
     
    4542        touch $@
    4643
    47 $(PKG_BUILD_DIR)/.built:
    48         $(MAKE) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install
     44$(WRKBUILD)/.built:
     45        $(MAKE) DESTDIR=$(WRKINST) -C $(WRKBUILD) install
    4946        touch $@
    5047
    5148$(IPKG_RADDUMP):
    5249        mkdir -p $(IDIR_RADDUMP)
    53         $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_RADDUMP)/
     50        $(CP) $(WRKINST)/* $(IDIR_RADDUMP)/
    5451        $(RSTRIP) $(IDIR_RADDUMP)
    5552        $(IPKG_BUILD) $(IDIR_RADDUMP) $(PACKAGE_DIR)
Note: See TracChangeset for help on using the changeset viewer.