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

[dmichelsen at users.sourceforge.net]

Revision: 2755
          http://gar.svn.sourceforge.net/gar/?rev=2755&view=rev
Author:   dmichelsen
Date:     2009-01-07 14:29:09 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
mGAR v2: Add fix to make package non-relocatable by default again

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 13:11:26 UTC (rev 2754)
+++ csw/mgar/gar/v2/bin/cswproto	2009-01-07 14:29:09 UTC (rev 2755)
@@ -77,6 +77,7 @@
 sub exclude {
     my $path = shift;
 
+    return 0 unless $stamp;
     return 1 unless $path;
 
     die "Path $path is not readable by current user!\n" unless -r $path or -l $path;
@@ -162,6 +163,7 @@
 
 # Common directories (CSWcommon plus a few others)
 __DATA__
+/
 /etc
 /etc/opt
 /etc/opt/csw

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-01-07 13:11:26 UTC (rev 2754)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-01-07 14:29:09 UTC (rev 2755)
@@ -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.