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

[allison at svn.parrot.org]

Author: allison
Date: Sat Jul 11 05:54:48 2009
New Revision: 39995
URL: https://trac.parrot.org/parrot/changeset/39995

Log:
[install] Modify pbc_to_exe so it uses the configured values for the
include directory instead of a hard-coded build directory path when
working with an installed parrot_config. Fixes the original bug report
for TT #495, but does not fix some build directory library paths also in
pbc_to_exe. These will also need to be fixed.

Modified:
   trunk/tools/dev/pbc_to_exe.pir

Modified: trunk/tools/dev/pbc_to_exe.pir
==============================================================================
--- trunk/tools/dev/pbc_to_exe.pir	Sat Jul 11 05:45:49 2009	(r39994)
+++ trunk/tools/dev/pbc_to_exe.pir	Sat Jul 11 05:54:48 2009	(r39995)
@@ -507,16 +507,26 @@
 
     $P0 = '_config'()
     .local string cc, ccflags, cc_o_out, osname, build_dir, slash
+    .local string installed, includepath, versiondir
     cc        = $P0['cc']
     ccflags   = $P0['ccflags']
     cc_o_out  = $P0['cc_o_out']
     osname    = $P0['osname']
     build_dir = $P0['build_dir']
     slash     = $P0['slash']
+    installed = $P0['installed']
+    includepath = $P0['includedir']
+    versiondir = $P0['versiondir']
 
     .local string includedir, pathquote
+    if installed == '1' goto installed_includedir
     includedir = concat build_dir, slash
     includedir = concat includedir, 'include'
+    goto done_includedir
+  installed_includedir:
+    includedir = concat includepath, versiondir
+  done_includedir:
+
     pathquote  = ''
     unless osname == 'MSWin32' goto not_windows
     pathquote  = '"'