Index: trunk/psconfig/psbuild
===================================================================
--- trunk/psconfig/psbuild	(revision 24606)
+++ trunk/psconfig/psbuild	(revision 24670)
@@ -153,7 +153,7 @@
 
     # set build environment variables
-    ps_setenv (1, "PATH",                 "--path");
-    ps_setenv (1, "CPATH",                "--cpath");
-    ps_setenv (1, "ARCH",                 "--arch");
+    ps_setenv (1, "PATH",            "--path");
+    ps_setenv (1, "CPATH",           "--cpath");
+    ps_setenv (1, "ARCH",            "--arch");
     ps_setenv (1, "LIBRARY_PATH",    "--library_path");
     ps_setenv (1, "LD_LIBRARY_PATH", "--ld_library_path");
@@ -161,4 +161,5 @@
     ps_setenv (1, "ACLOCAL_FLAGS",   "--aclocal_flags");
     ps_setenv (1, "PERL5LIB",        "--perl5lib");
+    ps_setenv (1, "CFITSIO",         "--prefix");
 
     exit 0;
@@ -211,4 +212,5 @@
     ps_setenv (0, "ACLOCAL_FLAGS",   "--aclocal_flags");
     ps_setenv (0, "PERL5LIB",        "--perl5lib");
+    ps_setenv (0, "CFITSIO",         "--prefix");
 
     # some versions of libtool use this value:
Index: trunk/psconfig/pscheckperl
===================================================================
--- trunk/psconfig/pscheckperl	(revision 24606)
+++ trunk/psconfig/pscheckperl	(revision 24670)
@@ -56,4 +56,7 @@
 $perldir = `csh -f psconfig.csh --perldir $version`; chomp $perldir;
 $homedir = `pwd`; chomp $homedir;
+
+# Astro::FITS::CFITSIO requires this to be set correctly...
+$ENV{'CFITSIO'} = $prefix;
 
 print "psconfig version: $version\n";