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

[fperrad at svn.parrot.org]

Author: fperrad
Date: Sat Sep  5 08:53:14 2009
New Revision: 40990
URL: https://trac.parrot.org/parrot/changeset/40990

Log:
[languages] partial revert of r40960

Modified:
   trunk/tools/dev/mk_inno_language.pl
   trunk/tools/dev/mk_language_shell.pl

Modified: trunk/tools/dev/mk_inno_language.pl
==============================================================================
--- trunk/tools/dev/mk_inno_language.pl	Sat Sep  5 06:48:16 2009	(r40989)
+++ trunk/tools/dev/mk_inno_language.pl	Sat Sep  5 08:53:14 2009	(r40990)
@@ -64,13 +64,13 @@
         ? qq{Source: ".\\library\\*.pbc"; DestDir: "{app}\\lib\\parrot\\library\\$lang"; Flags:}
         : '; no .pbc lib';
 my $pmc = <src/pmc/*.dll>
-        ? qq{Source: ".\\src\\pmc\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
+        ? qq{Source: ".\\src\\pmc\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
         : '; no pmc';
 my $ops = <src/ops/*.dll>
-        ? qq{Source: ".\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
+        ? qq{Source: ".\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
         : '; no ops';
 my $dynext = <dynext/*.dll> && !<src/pmc/*.dll> && !<src/ops/*.dll>
-           ? qq{Source: ".\\dynext\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
+           ? qq{Source: ".\\dynext\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
            : '; no dynext';
 my $man = -d 'man'
         ? qq{Source: ".\\man\\*"; DestDir: "{app}\\man\\parrot"; Flags: ignoreversion recursesubdirs}

Modified: trunk/tools/dev/mk_language_shell.pl
==============================================================================
--- trunk/tools/dev/mk_language_shell.pl	Sat Sep  5 06:48:16 2009	(r40989)
+++ trunk/tools/dev/mk_language_shell.pl	Sat Sep  5 08:53:14 2009	(r40990)
@@ -298,7 +298,8 @@
 INCLUDE_DIR   := @includedir@$(VERSION_DIR)
 LIB_DIR       := @libdir@$(VERSION_DIR)
 STAGING_DIR   := ../../dynext
-INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
+#INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
+INSTALL_DIR   := $(LIB_DIR)/dynext
 
 # Set up extensions
 LOAD_EXT      := @load_ext@
@@ -390,7 +391,8 @@
 SRC_DIR       := @srcdir@$(VERSION_DIR)
 TOOLS_DIR     := @libdir@$(VERSION_DIR)/tools/lib
 STAGING_DIR   := ../../dynext
-INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
+#INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
+INSTALL_DIR   := $(LIB_DIR)/dynext
 
 # Set up extensions
 LOAD_EXT      := @load_ext@