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

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Jun  5 21:59:27 2010
New Revision: 47390
URL: https://trac.parrot.org/parrot/changeset/47390

Log:
Treat absence of OS pmc same as absence of installed config.fpmc

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	Sat Jun  5 21:58:43 2010	(r47389)
+++ trunk/config/gen/config_pm/config_pir.in	Sat Jun  5 21:59:27 2010	(r47390)
@@ -47,19 +47,24 @@
 
     $S0 = concat prefix, "/runtime"
 
-    $P0 = loadlib 'os'
-    $P0 = new ['OS']
+    push_eh L1
+        # 'os' is dynop and can be absent at this point.
+        # Treat it as developers mode.
+        $P0 = loadlib 'os'
+        $P0 = new ['OS']
+        pop_eh
+
     push_eh file_not_found
         # OS.stat throws on file not found
         $P0.'stat'($S0)
         goto L1
-    pop_eh
   file_not_found:
-    conf_file = "@libdir@@versiondir@/include/config.fpmc"
+    conf_file = "/usr/local/lib/parrot/2.4.0-devel/include/config.fpmc"
     goto L2
   L1:
     conf_file = prefix . "/runtime/parrot/include/config.fpmc"
   L2:
+    pop_eh
 
     .local pmc CONF
     CONF = new 'FileHandle'