Changeset 28191

Timestamp:

Jun 2, 2010, 1:27:13 PM (16 years ago)

Author:

eugene

Message:

add perl_site to possible module locations; test for module after installation

Location:

trunk/psconfig

Files:

• pscheckmods (modified) (1 diff)
• pscheckperl (modified) (1 diff)
• psconfig.csh.in (modified) (2 diffs)

trunk/psconfig/pscheckmods

@@ -10 +10 @@
     exit 1;
 }
+# print "x: $x\n";
 
 $version = eval "\$$ARGV[0]::VERSION";

trunk/psconfig/pscheckperl

@@ -147 +147 @@
         vsystem ("make install");
     }
+    chdir $homedir;
 
-    chdir $homedir;
+    # we claim to have built the module; double-check that it can be found
+    system ("pscheckmods $module $modver");
+    if ($?) {
+        die "failed to find the module we just built: $module\n";
+    }
+    print "built $module\n\n";
 }
 if (!$build) {

trunk/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