Changeset 11737

Timestamp:

Feb 9, 2007, 1:22:38 PM (19 years ago)

Author:

eugene

Message:

updates

Location:

trunk/psconfig

Files:

• mkbuild (modified) (1 diff)
• psconfig.sh (modified) (1 diff)

trunk/psconfig/mkbuild

@@ -72 +72 @@
     }
 
-    $path = `csh psconfig.sh --path $version`;
-    $ldpath = `csh psconfig.sh --ldpath $version`;
-    $pkgpath = `csh psconfig.sh --pkgpath $version`;
-    $perlpath = `csh psconfig.sh --perlpath $version`;
-
-    
-
-
-    alias  psconfigure configure --prefix={$PSCONFDIR}/{$PSCONFIG} --bindir=$bindir --libdir=$libdir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share --mandir={$PSCONFDIR}/man
-        alias  psautogen autogen.sh --bindir=$bindir --libdir=$libdir --mandir=$mandir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share
-  alias  psperlbuild perl Build.PL --prefix {$PSCONFDIR}/{$PSCONFIG} --install_path script=$bindir --install_path arch=$bindir --install_path bin=$bindir --install_path lib=$libdir --install_path bindoc={$PSCONFDIR}/man/man1 --install_path libdoc={$PSCONFDIR}/man/man3
-
-    system ("env");
+    $psconfigure = `csh psconfig.sh --psconfigure $version`;
+    $psautogen   = `csh psconfig.sh --psautogen $version`;
+    $psperlbuild = `csh psconfig.sh --psperlbuild $version`;
+
+    # alias  psconfigure configure --prefix={$PSCONFDIR}/{$PSCONFIG} --bindir=$bindir --libdir=$libdir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share --mandir={$PSCONFDIR}/man
+    # alias  psautogen autogen.sh --bindir=$bindir --libdir=$libdir --mandir=$mandir --includedir={$PSCONFDIR}/{$PSCONFIG}/include --sysconfdir={$PSCONFDIR}/{$PSCONFIG}/etc --datadir={$PSCONFDIR}/share
+    # alias  psperlbuild perl Build.PL --prefix {$PSCONFDIR}/{$PSCONFIG} --install_path script=$bindir --install_path arch=$bindir --install_path bin=$bindir --install_path lib=$libdir --install_path bindoc={$PSCONFDIR}/man/man1 --install_path libdoc={$PSCONFDIR}/man/man3
+
+    print "psconfigure: $psconfigure\n";
+    print "psautogen: $psautogen\n";
+    print "psperlbuild: $psperlbuild\n";
+
     exit 1;
 

trunk/psconfig/psconfig.sh

@@ -281 +281 @@
 
 # list the defined psconfig versions
-if ($show_path) then
-  echo $PATH
-  exit 0
-endif
-
-# list the defined psconfig versions
-if ($show_ldpath) then
-  echo $LD_LIBRARY_PATH
-  exit 0
-endif
-
-# list the defined psconfig versions
-if ($show_pkgpath) then
-  echo $PKG_CONFIG_PATH
-  exit 0
-endif
-
-# list the defined psconfig versions
-if ($show_perlpath) then
-  echo $PERL5LIB
-  exit 0
-endif
-
+if ($show_configure) then
+  alias psconfigure 
+  exit 0
+endif
+
+# list the defined psconfig versions
+if ($show_autogen) then
+  alias psautogen
+  exit 0
+endif
+
+# list the defined psconfig versions
+if ($show_perlbuild) then
+  alias psperlbuild
+  exit 0
+endif