[svn:parrot] r47409 - trunk/config/gen/config_pm

[bacek at svn.parrot.org]

Author: bacek
Date: Sun Jun  6 00:31:57 2010
New Revision: 47409
URL: https://trac.parrot.org/parrot/changeset/47409

Log:
Unhardcode installed config.fpmc path slightly.

Modified:
   trunk/config/gen/config_pm/config_pir.in

Modified: trunk/config/gen/config_pm/config_pir.in
==============================================================================
--- trunk/config/gen/config_pm/config_pir.in	Sun Jun  6 00:05:18 2010	(r47408)
+++ trunk/config/gen/config_pm/config_pir.in	Sun Jun  6 00:31:57 2010	(r47409)
@@ -59,7 +59,16 @@
         $P0.'stat'($S0)
         goto L1
   file_not_found:
-    conf_file = "/usr/local/lib/parrot/2.4.0-devel/include/config.fpmc"
+    pop_eh
+    # Treat it as installed parrot.
+    # XXX Check why 2.4.0-devel is hardcoded here!
+    # XXX Check why it's different paths when we use default /usr/local vs specified prefix
+    push_eh file_not_found_2
+    conf_file = prefix . "/lib/2.4.0-devel/include/config.fpmc"
+    $P0.'stat'(conf_file)
+    goto L2
+  file_not_found_2:
+    conf_file = prefix . "/lib/parrot/2.4.0-devel/include/config.fpmc"
     goto L2
   L1:
     conf_file = prefix . "/runtime/parrot/include/config.fpmc"