[svn:mod_parrot] r663 - mod_parrot/trunk

Author: jhorwitz
Date: Tue Sep  1 05:41:24 2009
New Revision: 663

Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in

Log:
use versiondir if specified in parrot's config


Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Tue Sep  1 05:41:24 2009
@@ -105,6 +105,7 @@
     parrot_ld_load_flags => $parrot_config{'ld_load_flags'},
     parrot_lib_dir       => $parrot_config{'libdir'},
     parrot_src_dir       => $parrot_config{'srcdir'},
+    parrot_version_dir   => $parrot_config{'versiondir'},
     parrot_build_dir     => $parrot_config{'build_dir'},
     perl                 => $^X,
     perl6                => ($perl6 ||

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Tue Sep  1 05:41:24 2009
@@ -16,12 +16,13 @@
 PERL6=@perl6@
 APXS=@apxs@
 CP=@cp@
+PARROT_VERSION_DIR=@parrot_version_dir@
 PARROT_BIN_DIR=@parrot_bin_dir@
-PARROT_INC_DIR=@parrot_inc_dir@
+PARROT_INC_DIR=@parrot_inc_dir@$(PARROT_VERSION_DIR)
 PARROT_LD=@parrot_ld@
 PARROT_LD_LOAD_FLAGS=@parrot_ld_load_flags@
-PARROT_LIB_DIR=@parrot_lib_dir@
-PARROT_SRC_DIR=@parrot_src_dir@
+PARROT_LIB_DIR=@parrot_lib_dir@$(PARROT_VERSION_DIR)
+PARROT_SRC_DIR=@parrot_src_dir@$(PARROT_VERSION_DIR)
 PARROT=$(PARROT_BIN_DIR)/parrot
 PARROT_DYNEXT=$(PARROT_LIB_DIR)/dynext
 PMC2C=$(PERL) $(PARROT_LIB_DIR)/tools/build/pmc2c.pl

• [svn:mod_parrot] r663 - mod_parrot/trunk by jhorwitz