Index: /trunk/psconfig/psconfig.csh
===================================================================
--- /trunk/psconfig/psconfig.csh	(revision 14424)
+++ /trunk/psconfig/psconfig.csh	(revision 14425)
@@ -6,6 +6,8 @@
 set show_libs = 0
 set show_bin = 0
+set show_man = 0
 set show_arch = 0
 set show_path = 0
+set show_cpath = 0
 set show_include = 0
 set show_configure = 0
@@ -16,4 +18,5 @@
 set show_psversion = 0
 set show_psconfdir = 0
+set show_library_path = 0
 set show_ld_library_path = 0
 set show_pkg_config_path = 0
@@ -37,4 +40,7 @@
       set show_bin = 1
       breaksw
+    case --man
+      set show_man = 1
+      breaksw
     case --include
       set show_include = 1
@@ -64,4 +70,7 @@
       set show_ld_library_path = 1
       breaksw;
+    case --library_path
+      set show_library_path = 1
+      breaksw;
     case --pkg_config_path
       set show_pkg_config_path = 1
@@ -72,4 +81,7 @@
     case --path
       set show_path = 1
+      breaksw;
+    case --cpath
+      set show_cpath = 1
       breaksw;
     case --aclocal_flags
@@ -104,4 +116,5 @@
 
 if ($?CPATH == 0) setenv CPATH
+if ($?LIBRARY_PATH == 0) setenv LIBRARY_PATH
 if ($?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH
 if ($?PKG_CONFIG_PATH == 0) setenv PKG_CONFIG_PATH
@@ -191,5 +204,5 @@
 endif
 
-set mandir  = {$PSCONFDIR}/man
+set mandir  = {$PSCONFDIR}/{$PSCONFIG}/man
 set newpath = ""
 set pathlist = `echo $MANPATH | tr ':' '\n'`
@@ -344,17 +357,21 @@
 # list selected environment variables
 if ($show_prefix) then
-  echo $PSCONFDIR/$PSVERSION.$ARCH
+  echo $PSCONFDIR/$PSCONFIG
   exit 0
 endif
 if ($show_libs) then
-  echo $PSCONFDIR/$PSVERSION.$ARCH/lib
+  echo $libdir
   exit 0
 endif
 if ($show_bin) then
-  echo $PSCONFDIR/$PSVERSION.$ARCH/bin
+  echo $bindir
+  exit 0
+endif
+if ($show_man) then
+  echo $mandir
   exit 0
 endif
 if ($show_include) then
-  echo $PSCONFDIR/$PSVERSION.$ARCH/include
+  echo $incdir
   exit 0
 endif
@@ -403,4 +420,9 @@
 endif
 
+if ($show_library_path) then
+  echo $LIBRARY_PATH
+  exit 0
+endif
+
 if ($show_pkg_config_path) then
   echo $PKG_CONFIG_PATH
@@ -415,4 +437,9 @@
 if ($show_path) then
   echo $PATH
+  exit 0
+endif
+
+if ($show_cpath) then
+  echo $CPATH
   exit 0
 endif
@@ -450,8 +477,10 @@
   echo "       psconfig --psversion"
   echo "       psconfig --psconfdir"
+  echo "       psconfig --library_path"
   echo "       psconfig --ld_library_path"
   echo "       psconfig --pkg_config_path"
   echo "       psconfig --arch"
   echo "       psconfig --path"
+  echo "       psconfig --cpath"
   echo "       psconfig --aclocal_flags"
   echo