summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2007-01-13 09:02:46 +0000
committerKeri Harris <keri@gentoo.org>2007-01-13 09:02:46 +0000
commitf1202d4042fd06bb096548d72dc330b3985bb18f (patch)
treeb4063631182f9a1faa54e246d27147feadc08a64 /dev-lang/mercury/files
parentmasked ancient guile-gtk-0.19-r1 (diff)
downloadhistorical-f1202d4042fd06bb096548d72dc330b3985bb18f.tar.gz
historical-f1202d4042fd06bb096548d72dc330b3985bb18f.tar.bz2
historical-f1202d4042fd06bb096548d72dc330b3985bb18f.zip
Do not parallelize generation of .dev and .dv files.
Package-Manager: portage-2.1.2_rc4-r2
Diffstat (limited to 'dev-lang/mercury/files')
-rw-r--r--dev-lang/mercury/files/mercury-0.13.1-multilib.patch11
1 files changed, 10 insertions, 1 deletions
diff --git a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
index 195220801c9a..cb25ceb87365 100644
--- a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
+++ b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
@@ -45,7 +45,7 @@
-INSTALL_ELISP_DIR = $(INSTALL_PREFIX)/lib/mercury/elisp
+INSTALL_PREFIX =
+FINAL_INSTALL_PREFIX =
-+INSTALL_BINDIR = $(INSTALL_PREFIX)/@prefix/bin
++INSTALL_BINDIR = $(INSTALL_PREFIX)/@prefix@/bin
+INSTALL_LIBDIR = $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
+FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
@@ -61,3 +61,12 @@
INSTALL_CGI_DIR = @CGIDIR@
# You should not need to override anything below here
+@@ -741,7 +741,7 @@
+ INSTALL_INC_DIR = $(INSTALL_LIBDIR)/inc
+ INSTALL_MMAKE_DIR = $(INSTALL_LIBDIR)/mmake
+ FULLARCH = @FULLARCH@
+-INSTALL_MERC_BIN_DIR = $(INSTALL_PREFIX)/bin
++INSTALL_MERC_BIN_DIR = $(INSTALL_PREFIX)/@prefix@/bin
+ INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib
+ FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib
+ INSTALL_MERC_LIB_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)