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

[dmichelsen at users.sourceforge.net]

Revision: 2753
          http://gar.svn.sourceforge.net/gar/?rev=2753&view=rev
Author:   dmichelsen
Date:     2009-01-07 13:10:37 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
mGAR v2: Fix prototype generation when making relative hardlinks to files in other directories within the package

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/cswproto
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/bin/cswproto
===================================================================
--- csw/mgar/gar/v2/bin/cswproto	2009-01-07 12:33:54 UTC (rev 2752)
+++ csw/mgar/gar/v2/bin/cswproto	2009-01-07 13:10:37 UTC (rev 2753)
@@ -132,7 +132,6 @@
                 ? catfile($actual, $lhs)
                 : $lhs;
 
-            $F[2] = join "=", $lhs, basename($rhs) if $F[0] eq 'l';
         }
         else {
             $F[2] = $lhs if $lhs and $rhs;

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-01-07 12:33:54 UTC (rev 2752)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-01-07 13:10:37 UTC (rev 2753)
@@ -55,7 +55,7 @@
 SPKG_SPOOLDIR  ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH)
 SPKG_EXPORT    ?= $(WORKDIR)
 SPKG_PKGROOT   ?= $(PKGROOT)
-SPKG_PKGBASE   ?= $(CURDIR)/$(WORKDIR)
+SPKG_PKGBASE   ?= $(PKGROOT)
 SPKG_WORKDIR   ?= $(CURDIR)/$(WORKDIR)
 
 SPKG_DEPEND_DB  = $(GARDIR)/csw/depend.db
@@ -162,7 +162,7 @@
 
 # Pulled in from pkglib/csw_prototype.gspec
 $(PROTOTYPE): $(WORKDIR) merge
-	$(_DBG)cswproto -r $(PKGROOT) $(PKGROOT) >$@
+	$(_DBG)cswproto -r $(PKGROOT) $(PKGROOT)=. >$@
 
 .PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH)
 $(WORKDIR)/%.prototype: | $(PROTOTYPE)


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