[csw-devel] SF.net SVN: gar:[3284] csw/mgar/gar/v2
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Feb 20 14:53:21 CET 2009
Revision: 3284
http://gar.svn.sourceforge.net/gar/?rev=3284&view=rev
Author: dmichelsen
Date: 2009-02-20 13:53:21 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
mGAR v2: Introduce WORKDIR_FIRSTMOD for the sake of completeness
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2009-02-20 10:02:32 UTC (rev 3283)
+++ csw/mgar/gar/v2/gar.conf.mk 2009-02-20 13:53:21 UTC (rev 3284)
@@ -18,11 +18,12 @@
PARTIALDIR ?= $(DOWNLOADDIR)/partial
WORKROOTDIR ?= work
WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION)
+WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))
COOKIEROOTDIR ?= cookies
COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION)
EXTRACTDIR ?= $(WORKDIR)
WORKSRC ?= $(WORKDIR)/$(DISTNAME)
-WORKSRC_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)
+WORKSRC_FIRSTMOD ?= $(WORKDIR_FIRSTMOD)/$(DISTNAME)
INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION)
PKGDIR ?= $(WORKROOTDIR)/package
SCRATCHDIR ?= tmp
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-02-20 10:02:32 UTC (rev 3283)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-02-20 13:53:21 UTC (rev 3284)
@@ -134,7 +134,7 @@
PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
-PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_FIRSTMOD PKGROOT
+PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT
PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY
PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES
PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP
@@ -443,7 +443,6 @@
--workdir $(SPKG_WORKDIR) \
--pkgbase $(SPKG_PKGBASE) \
--pkgroot $(SPKG_PKGROOT) \
- -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \
--compress \
$(MKPACKAGE_ARGS) ) || exit 2
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list