[svn:parrot] r40039 - trunk/tools/dev

allison at svn.parrot.org allison at svn.parrot.org
Sun Jul 12 23:02:30 UTC 2009


Author: allison
Date: Sun Jul 12 23:02:29 2009
New Revision: 40039
URL: https://trac.parrot.org/parrot/changeset/40039

Log:
[install] Change pbc_to_exe to use configured paths for accesing lib/
components when running from an install. Resolves TT #495.

Modified:
   trunk/tools/dev/pbc_to_exe.pir

Modified: trunk/tools/dev/pbc_to_exe.pir
==============================================================================
--- trunk/tools/dev/pbc_to_exe.pir	Sun Jul 12 22:59:21 2009	(r40038)
+++ trunk/tools/dev/pbc_to_exe.pir	Sun Jul 12 23:02:29 2009	(r40039)
@@ -568,6 +568,7 @@
     $P0 = '_config'()
     .local string cc, link, link_dynamic, linkflags, ld_out, libparrot, libs, o
     .local string rpath, osname, build_dir, slash, icushared
+    .local string installed, libdir, versiondir
     cc           = $P0['cc']
     link         = $P0['link']
     link_dynamic = $P0['link_dynamic']
@@ -581,18 +582,29 @@
     build_dir    = $P0['build_dir']
     slash        = $P0['slash']
     icushared    = $P0['icu_shared']
+    installed    = $P0['installed']
+    libdir       = $P0['libdir']
+    versiondir   = $P0['versiondir']
 
     .local string config, pathquote, exeprefix
+    if installed == '1' goto config_installed
     exeprefix = substr exefile, 0, 12
     config     = concat build_dir, slash
     config    .= 'src'
     config    .= slash
-    if exeprefix == 'installable_' goto config_install
+    if exeprefix == 'installable_' goto config_to_install
     config    .= 'parrot_config'
     goto config_cont
- config_install:
+ config_to_install:
     config    .= 'install_config'
     rpath     = $P0['rpath_lib']
+    goto config_cont
+ config_installed:
+    rpath      = $P0['rpath_lib']
+    libparrot  = $P0['inst_libparrot_linkflags']
+    config     = concat libdir, versiondir
+    config    .= slash
+    config    .= 'parrot_config'
  config_cont:
     config    .= o
     pathquote  = ''


More information about the parrot-commits mailing list