[Gmod-schema-cmts] SF.net SVN: gmod:[25277] schema/trunk/chado

[<sco...@us...>]

Revision: 25277
          http://gmod.svn.sourceforge.net/gmod/?rev=25277&view=rev
Author:   scottcain
Date:     2012-12-11 17:25:38 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Modified Makefile.PL so that if using PREFIX it won't stomp on the
GMOD_ROOT envirnment variable (that is, everything goes in PREFIX, except what
goes in GMOD_ROOT).

Modified Paths:
--------------
    schema/trunk/chado/Changes
    schema/trunk/chado/Makefile.PL

Modified: schema/trunk/chado/Changes
===================================================================
--- schema/trunk/chado/Changes	2012-11-08 09:48:15 UTC (rev 25276)
+++ schema/trunk/chado/Changes	2012-12-11 17:25:38 UTC (rev 25277)
@@ -5,6 +5,9 @@
 mishmash that was being used in various scripts.
 * Fixed the GFF3 preprocessor so that if an insert into the sorting table fails,
 the script will die to avoid losing GFF lines in the resulting file.
+* Modified Makefile.PL so that if using PREFIX it won't stomp on the 
+GMOD_ROOT envirnment variable (that is, everything goes in PREFIX, except what
+goes in GMOD_ROOT).
 
 Version 1.22 Thu Nov 17 12:48:10 EST 2011
 * Created a script to automatically create the schemas dirs for a release and

Modified: schema/trunk/chado/Makefile.PL
===================================================================
--- schema/trunk/chado/Makefile.PL	2012-11-08 09:48:15 UTC (rev 25276)
+++ schema/trunk/chado/Makefile.PL	2012-12-11 17:25:38 UTC (rev 25277)
@@ -206,7 +206,7 @@
 @ARGV = ();
 push @ARGV, "PREFIX=$opts{PREFIX}" if $opts{PREFIX};
 push @ARGV, "INSTALL_BASE=$opts{INSTALL_BASE}" if $opts{INSTALL_BASE};
-$O{'GMOD_ROOT'} = $opts{PREFIX} if $opts{PREFIX};
+$O{'GMOD_ROOT'} = $opts{PREFIX} if ($opts{PREFIX} and !$ENV{GMOD_ROOT});
 push @ARGV, "INSTALLSITEMAN1DIR=$opts{INSTALLSITEMAN1DIR}" if $opts{INSTALLSITEMAN1DIR};
 push @ARGV, "INSTALLSITEMAN3DIR=$opts{INSTALLSITEMAN3DIR}" if $opts{INSTALLSITEMAN3DIR};
 push @ARGV, "LIB=$opts{LIB}" if $opts{LIB};

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