Index: trunk/psconfig/psconfig.csh
===================================================================
--- trunk/psconfig/psconfig.csh	(revision 15158)
+++ trunk/psconfig/psconfig.csh	(revision 16092)
@@ -243,15 +243,18 @@
   endif
 end
+
+## XXX mysql (and others?) are not installed in the correct location: they go into
+## prefix/lib/mysql regardless of configure options
 if ("$PSCONFIG" == "none") then
   if ("$newpath" == "") then
     unsetenv CPATH
   else
-    setenv CPATH {$newpath}
-  endif 
-else
-  if ("$newpath" == "") then
-    setenv CPATH {$incdir}:
-  else
-    setenv CPATH {$incdir}:{$newpath}
+    setenv CPATH {$newpath}:
+  endif 
+else
+  if ("$newpath" == "") then
+    setenv CPATH {$incdir}:{$PSCONFDIR}/{$PSCONFIG}/include/mysql:
+  else
+    setenv CPATH {$incdir}:{$PSCONFDIR}/{$PSCONFIG}/include/mysql:{$newpath}:
   endif 
 endif 
@@ -270,4 +273,7 @@
   endif
 end
+
+## XXX mysql (and others?) are not installed in the correct location: they go into
+## prefix/lib/mysql regardless of configure options
 if ("$PSCONFIG" == "none") then
   if ("$newpath" == "") then
@@ -275,14 +281,14 @@
     unsetenv LIBRARY_PATH
   else
-    setenv LD_LIBRARY_PATH {$newpath}
-    setenv LIBRARY_PATH {$newpath}
-  endif 
-else
-  if ("$newpath" == "") then
-    setenv LD_LIBRARY_PATH {$libdir}:
-    setenv LIBRARY_PATH {$libdir}:
-  else
-    setenv LD_LIBRARY_PATH {$libdir}:{$newpath}
-    setenv LIBRARY_PATH {$libdir}:{$newpath}
+    setenv LD_LIBRARY_PATH {$newpath}:
+    setenv LIBRARY_PATH {$newpath}:
+  endif 
+else
+  if ("$newpath" == "") then
+    setenv LD_LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:
+    setenv LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:
+  else
+    setenv LD_LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:{$newpath}:
+    setenv LIBRARY_PATH {$libdir}:{$PSCONFDIR}/{$PSCONFIG}/lib/mysql:{$newpath}:
   endif 
 endif 
@@ -312,8 +318,6 @@
   if ("$newpath" == "") then
     setenv PERL5LIB {$plibdir}:
-    # setenv PERL5LIB {$plibdir}:{$plib5dir}:
   else
     setenv PERL5LIB {$plibdir}:{$newpath}
-    # setenv PERL5LIB {$plibdir}:{$plib5dir}:{$newpath}
   endif 
 endif