[csw-devel] SF.net SVN: gar:[2482] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 2482
          http://gar.svn.sourceforge.net/gar/?rev=2482&view=rev
Author:   dmichelsen
Date:     2008-12-09 09:54:32 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
mGAR v2: Use WORKSRC for first modulation

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	2008-12-09 09:45:39 UTC (rev 2481)
+++ csw/mgar/gar/v2/gar.conf.mk	2008-12-09 09:54:32 UTC (rev 2482)
@@ -21,8 +21,8 @@
 COOKIEROOTDIR ?= cookies
 COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION)
 EXTRACTDIR ?= $(WORKDIR)
-WORKSRC ?= $(WORKDIR)/$(DISTNAME)
-WORKSRC_DEFAULT ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME)
+#WORKSRC ?= $(WORKDIR)/$(DISTNAME)
+WORKSRC ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(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	2008-12-09 09:45:39 UTC (rev 2481)
+++ csw/mgar/gar/v2/gar.pkg.mk	2008-12-09 09:54:32 UTC (rev 2482)
@@ -61,7 +61,7 @@
 PKGLIB = $(CURDIR)/$(GARDIR)/pkglib
 
 PKG_EXPORTS  = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN
-PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_DEFAULT PKGROOT
+PKG_EXPORTS += CURDIR WORKDIR WORKSRC 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.