[interchange-cvs] interchange - jon modified scripts/interchange.PL

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Tue Jan 30 14:57:03 EST 2007


User:      jon
Date:      2007-01-30 19:57:03 GMT
Modified:  scripts  interchange.PL
Log:
Support new INTERCHANGE_INSTALLPRIVLIB and INTERCHANGE_INSTALLARCHLIB
environment variables, to allow for a bin/interchange that has no
hardcoded paths in it at all (along with the help of MINIVEND_ROOT).

Revision  Changes    Path
2.93      +20 -7     interchange/scripts/interchange.PL


rev 2.93, prev_rev 2.92
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -u -r2.92 -r2.93
--- interchange.PL	21 Sep 2006 14:56:39 -0000	2.92
+++ interchange.PL	30 Jan 2007 19:57:02 -0000	2.93
@@ -3,9 +3,9 @@
 #
 # Interchange version 5.5.0
 #
-# $Id: interchange.PL,v 2.92 2006/09/21 14:56:39 jon Exp $
+# $Id: interchange.PL,v 2.93 2007/01/30 19:57:02 jon Exp $
 #
-# Copyright (C) 2002-2006 Interchange Development Group
+# Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 # http://www.icdevgroup.org/
 #
@@ -29,12 +29,25 @@
 # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA  02111-1307  USA.
 
-use lib '/usr/local/interchange/lib';
-#use lib '~_~INSTALLPRIVLIB~_~';
-use lib '/usr/local/interchange';
-#use lib '~_~INSTALLARCHLIB~_~';
-
 use strict;
+
+BEGIN {
+	if ($ENV{INTERCHANGE_INSTALLPRIVLIB}) {
+		unshift @INC, $ENV{INTERCHANGE_INSTALLPRIVLIB};
+	}
+	else {
+		unshift @INC, '/usr/local/interchange/lib';
+#		unshift @INC, '~_~INSTALLPRIVLIB~_~';
+	}
+
+	if ($ENV{INTERCHANGE_INSTALLARCHLIB}) {
+		unshift @INC, $ENV{INTERCHANGE_INSTALLARCHLIB};
+	}
+	else {
+		unshift @INC, '/usr/local/interchange';
+#		unshift @INC, '~_~INSTALLARCHLIB~_~';
+	}
+}
 
 use Config;
 no Config;








More information about the interchange-cvs mailing list