Changeset 16092 for trunk/psconfig/pschecklibs

Timestamp:

Jan 15, 2008, 6:01:17 PM (19 years ago)

Author:

eugene

Message:

fixing various build issues: where to get mysql, options passed to extlibs, name cleanups

File:

• trunk/psconfig/pschecklibs (modified) (3 diffs)

trunk/psconfig/pschecklibs

@@ -63 +63 @@
 $mandir      = `csh psconfig.csh --man $version`;         chomp $mandir;
 $incdir      = `csh psconfig.csh --include $version`;     chomp $incdir;
+$prefix      = `csh psconfig.csh --prefix $version`;      chomp $prefix;
+
+$homedir     = `pwd`; chomp $homedir;
+$psconfdir   = `csh psconfig.csh --psconfdir $version`;   chomp $psconfdir;
 $psconfigure = `csh psconfig.csh --psconfigure $version`; chomp $psconfigure;
-$prefix      = `csh psconfig.csh --prefix $version`;      chomp $prefix;
-$homedir     = `pwd`; chomp $homedir;
 
 print "psconfig version: $version\n";
@@ -113 +115 @@
 print "\n";
 
-if ($build && ! -d $PSCONFDIR) {
-    mkdir $PSCONFDIR || die "unable to create psconfig dir $PSCONFDIR";
+if ($build && ! -d $psconfdir) {
+    mkdir $psconfdir || die "unable to create psconfig dir $psconfdir";
 }
 
@@ -200 +202 @@
     # build the library using psconfigure, make, make install
     if ($configure_opts eq "NONE") { 
-        if ($use_equals eq "Y") {
-            vsystem ("configure --prefix=$prefix");
-        } else {
-            vsystem ("configure --prefix $prefix");
-        }
+        vsystem ("$psconfigure");
     } else {
         $configure_opts = join (' ', split (',', $configure_opts));
-        vsystem ("configure --prefix=$prefix $configure_opts");
+        vsystem ("$psconfigure $configure_opts");
     }
     if ($?) { &failure($name, "failure in configure"); }