Index: /trunk/psconfig/pschecklibs
===================================================================
--- /trunk/psconfig/pschecklibs	(revision 22708)
+++ /trunk/psconfig/pschecklibs	(revision 22709)
@@ -157,14 +157,14 @@
 
     if ($auto_force eq "Y") {
-	print "$name will be built\n";
+        print "$name will be built\n";
     }
 
     if ($found) {
-	if ($found eq "runtime-only") {
-	    print "runtime $name ($found)\n";
-	    push @faillibs, "$name";
-	} else {
-	    print "pass $name ($found)\n";
-	}
+        if ($found eq "runtime-only") {
+            print "runtime $name ($found)\n";
+            push @faillibs, "$name";
+        } else {
+            print "pass $name ($found)\n";
+        }
         next;
     } else {
@@ -174,5 +174,5 @@
 
     if ($auto_force eq "Y") {
-	print "$name will be built\n";
+        print "$name will be built\n";
     }
 
@@ -254,17 +254,20 @@
     if ($?) { &failure($name, "failure in configure"); }
 
+    my $make = "make";          # Command for make
+    $make .= ' ' . $ENV{'PSCONFIG_MAKEOPTS'} if defined $ENV{'PSCONFIG_MAKEOPTS'};
+
     if ($make_opts eq "NONE") {
-        vsystem ("make");
+        vsystem ($make);
     } else {
         $make_opts = join (' ', split (',', $make_opts));
-        vsystem ("make $make_opts");
+        vsystem ("$make $make_opts");
     }
     if ($?) { &failure($name, "failure in make"); }
 
     if ($install_opts eq "NONE") {
-        vsystem ("make install");
+        vsystem ("$make install");
     } else {
         $install_opts = join (' ', split (',', $install_opts));
-        vsystem ("make install $install_opts");
+        vsystem ("$make install $install_opts");
     }
     if ($?) { &failure($name, "failure in make install"); }
@@ -315,29 +318,29 @@
         # versions libraries if we find only a .so.N without a matching
         # .so, we link this in the installed libdir
-	# XXX this was probably a mistake to allow some systems to build without supplied libs
-	if (1) {
-	    foreach $topdir ( @libpath ) {
-		foreach $subdir ( @subdirs ) {
-		    if ($subdir eq ".") {
-			$path = $topdir;
-		    } else {
-			$path = "$topdir/$subdir";
-		    }
-		    if (! -e $path) { next; }
-		    @libnames = <$path/$tryname.$dlltype*>;
-		    if (@libnames > 0) {
-			$libname = @libnames[-1];
-			$needdev = 1;
-			# print " *** need developer version of $name\n";
-			return "runtime-only";
-
-			# XXX old option: link in existing library
-			# symlink $libname, "$libdir/$f.$dlltype";
-			# if ($?) { exit 1; }
-			# return $libname;
-		    }
-		}
-	    }
-	}
+        # XXX this was probably a mistake to allow some systems to build without supplied libs
+        if (1) {
+            foreach $topdir ( @libpath ) {
+                foreach $subdir ( @subdirs ) {
+                    if ($subdir eq ".") {
+                        $path = $topdir;
+                    } else {
+                        $path = "$topdir/$subdir";
+                    }
+                    if (! -e $path) { next; }
+                    @libnames = <$path/$tryname.$dlltype*>;
+                    if (@libnames > 0) {
+                        $libname = @libnames[-1];
+                        $needdev = 1;
+                        # print " *** need developer version of $name\n";
+                        return "runtime-only";
+
+                        # XXX old option: link in existing library
+                        # symlink $libname, "$libdir/$f.$dlltype";
+                        # if ($?) { exit 1; }
+                        # return $libname;
+                    }
+                }
+            }
+        }
     }
     return 0;