Changeset 28484 for branches/pap/psconfig/psconfig.csh.in

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psconfig/psconfig.csh.in (modified) (2 diffs)

branches/pap/psconfig/psconfig.csh.in

@@ -358 +358 @@
 set plibdir  = {$PSCONFDIR}/{$PSCONFIG}/lib
 set plib5dir = {$PSCONFDIR}/{$PSCONFIG}/lib/perl5
+set plibsite = {$PSCONFDIR}/{$PSCONFIG}/lib/perl5/site_perl
 set newpath = ""
 set pathlist = `echo $PERL5LIB | tr ':' '\n'`
@@ -378 +379 @@
 else
   if ("$newpath" == "") then
-    setenv PERL5LIB {$plibdir}:{$plib5dir}:
-  else
-    setenv PERL5LIB {$plibdir}:{$plib5dir}:{$newpath}
+    setenv PERL5LIB {$plibdir}:{$plib5dir}:{$plibsite}
+  else
+    setenv PERL5LIB {$plibdir}:{$plib5dir}:{$plibsite}:{$newpath}
   endif 
 endif