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

[fperrad at svn.parrot.org]

Author: fperrad
Date: Thu Feb 19 22:08:03 2009
New Revision: 36892
URL: https://trac.parrot.org/parrot/changeset/36892

Log:
[tools] fix install paths

Modified:
   trunk/tools/dev/mk_language_shell.pl

Modified: trunk/tools/dev/mk_language_shell.pl
==============================================================================
--- trunk/tools/dev/mk_language_shell.pl	Thu Feb 19 21:45:36 2009	(r36891)
+++ trunk/tools/dev/mk_language_shell.pl	Thu Feb 19 22:08:03 2009	(r36892)
@@ -188,9 +188,9 @@
 LOAD_EXT      = @load_ext@
 O             = @o@
 BIN_DIR       = @bin_dir@
-LIB_DIR       = @lib_dir@
-DOC_DIR       = @doc_dir@
-MANDIR        = @mandir@
+LIB_DIR       = @lib_dir@@versiondir@
+DOC_DIR       = @doc_dir@@versiondir@
+MANDIR        = @mandir@@versiondir@
 PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
 
 ## Setup some commands
@@ -316,15 +316,15 @@
 	echo "1" | ./installable_ at lclang@@exe@
 
 install: installable
-	$(CP) installable_ at lclang@@exe@ $(DESTDIR)$(BIN_DIR)/parrot- at lclang@@exe@
-	@cd $(OPS_DIR) && $(OPSBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(OPSLIB)
-	@cd $(PMC_DIR) && $(PMCBUILD) copy "--destination=$(DESTDIR)$(LIB_DIR)/parrot/dynext" $(PMCS)
-	-$(MKPATH) $(LIB_DIR)/parrot/languages/@lclang@
-	$(CP) @lclang at .pbc $(DESTDIR)$(LIB_DIR)/parrot/languages/@lclang@/@lclang at .pbc
-	-$(MKPATH) $(DESTDIR)$(MANDIR)/man1
-	$(POD2MAN) doc/running.pod > $(DESTDIR)$(MANDIR)/man1/parrot- at lclang@.1
-	-$(MKPATH) $(DESTDIR)$(DOC_DIR)/languages/@lclang@
-	$(CP) $(DOCS) $(DESTDIR)$(DOC_DIR)/languages/@lclang@
+	$(CP) installable_ at lclang@@exe@ $(BIN_DIR)/parrot- at lclang@@exe@
+	@cd $(OPS_DIR) && $(OPSBUILD) copy "--destination=$(LIB_DIR)/dynext" $(OPSLIB)
+	@cd $(PMC_DIR) && $(PMCBUILD) copy "--destination=$(LIB_DIR)/dynext" $(PMCS)
+	-$(MKPATH) $(LIB_DIR)/languages/@lclang@
+	$(CP) @lclang at .pbc $(LIB_DIR)/languages/@lclang@/@lclang at .pbc
+	-$(MKPATH) $(MANDIR)/man1
+	$(POD2MAN) doc/running.pod > $(MANDIR)/man1/parrot- at lclang@.1
+	-$(MKPATH) $(DOC_DIR)/languages/@lclang@
+	$(CP) $(DOCS) $(DOC_DIR)/languages/@lclang@
 
 win32-inno-installer: installable
 	-$(MKPATH) man/man1