Changeset 25027 for branches/pap/psconfig/psbuild

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/psbuild (modified) (3 diffs)

branches/pap/psconfig/psbuild

@@ -153 +153 @@
 
     # 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 +161 @@
     ps_setenv (1, "ACLOCAL_FLAGS",   "--aclocal_flags");
     ps_setenv (1, "PERL5LIB",        "--perl5lib");
+    ps_setenv (1, "CFITSIO",         "--prefix");
 
     exit 0;
@@ -211 +212 @@
     ps_setenv (0, "ACLOCAL_FLAGS",   "--aclocal_flags");
     ps_setenv (0, "PERL5LIB",        "--perl5lib");
+    ps_setenv (0, "CFITSIO",         "--prefix");
 
     # some versions of libtool use this value: