[languages] install dynops & dynpmc in languages/lang/dynext

(see PDD30) git-svn-id: https://svn.parrot.org/parrot/trunk@40960 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
ashgti · Sep 3, 2009 · 310212c · 310212c
1 parent 011fdc3
commit 310212c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tools/dev/mk_inno_language.pl b/tools/dev/mk_inno_language.pl
@@ -64,13 +64,13 @@ =head1 SEE ALSO
         ? 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\\dynext"; Flags:}
+        ? qq{Source: ".\\src\\pmc\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
         : '; no pmc';
 my $ops = <src/ops/*.dll>
-        ? qq{Source: ".\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
+        ? qq{Source: ".\\src\\ops\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
         : '; no ops';
-my $dynext = <dynext/*.dll>
-           ? qq{Source: ".\\dynext\\*.dll"; DestDir: "{app}\\lib\\parrot\\dynext"; Flags:}
+my $dynext = <dynext/*.dll> && !<src/pmc/*.dll> && !<src/ops/*.dll>
+           ? qq{Source: ".\\dynext\\*.dll"; DestDir: "{app}\\lib\\parrot\\languages\\$lang\\dynext"; Flags:}
            : '; no dynext';
 my $man = -d 'man'
         ? qq{Source: ".\\man\\*"; DestDir: "{app}\\man\\parrot"; Flags: ignoreversion recursesubdirs}

diff --git a/tools/dev/mk_language_shell.pl b/tools/dev/mk_language_shell.pl
@@ -297,10 +297,8 @@ sub create_makefiles {
 VERSION_DIR   := @versiondir@
 INCLUDE_DIR   := @includedir@$(VERSION_DIR)
 LIB_DIR       := @libdir@$(VERSION_DIR)
-#STAGING_DIR   := ../../dynext
-STAGING_DIR   := @build_dir@/runtime/parrot/dynext
-#INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
-INSTALL_DIR   := $(LIB_DIR)/dynext
+STAGING_DIR   := ../../dynext
+INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
 
 # Set up extensions
 LOAD_EXT      := @load_ext@
@@ -309,6 +307,7 @@ sub create_makefiles {
 # Setup some commands
 PERL          := @perl@
 RM_F          := @rm_f@
+MKPATH        := @mkpath@
 CHMOD         := @chmod@
 CP            := @cp@
 CC            := @cc@ -c
@@ -361,6 +360,7 @@ sub create_makefiles {
 
 install:
 #IF(cygwin or hpux):	CHMOD 0775 "*$(LOAD_EXT)"
+	$(MKPATH) $(INSTALL_DIR)
 	$(CP) "*$(LOAD_EXT)" $(INSTALL_DIR)
 
 uninstall:
@@ -389,10 +389,8 @@ sub create_makefiles {
 LIB_DIR       := @libdir@$(VERSION_DIR)
 SRC_DIR       := @srcdir@$(VERSION_DIR)
 TOOLS_DIR     := @libdir@$(VERSION_DIR)/tools/lib
-#STAGING_DIR   := ../../dynext
-STAGING_DIR   := @build_dir@/runtime/parrot/dynext
-#INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
-INSTALL_DIR   := $(LIB_DIR)/dynext
+STAGING_DIR   := ../../dynext
+INSTALL_DIR   := $(LIB_DIR)/languages/@lclang@/dynext
 
 # Set up extensions
 LOAD_EXT      := @load_ext@
@@ -401,6 +399,7 @@ sub create_makefiles {
 # Setup some commands
 PERL          := @perl@
 RM_F          := @rm_f@
+MKPATH        := @mkpath@
 CHMOD         := @chmod@
 CP            := @cp@
 CC            := @cc@ -c
@@ -463,6 +462,7 @@ sub create_makefiles {
 
 install:
 #IF(cygwin or hpux):	CHMOD 0775 "*$(LOAD_EXT)"
+	$(MKPATH) $(INSTALL_DIR)
 	$(CP) "*$(LOAD_EXT)" $(INSTALL_DIR)
 
 uninstall: