--- mercury-compiler-0.13.1.orig/Mmake.common.in	2006-08-07 16:47:53.000000000 +1200
+++ mercury-compiler-0.13.1/Mmake.common.in	2007-01-13 12:50:48.000000000 +1300
@@ -118,8 +118,8 @@
 # Set the installation prefix. This is done here as well as
 # in scripts/Mmake.vars to avoid accidentally overwriting an
 # existing installation when using an installed mmake.
-INSTALL_PREFIX		= @prefix@
-FINAL_INSTALL_PREFIX	= @prefix@
+INSTALL_PREFIX		=
+FINAL_INSTALL_PREFIX	=
 
 INSTALLABLE_PREFIX	= @INSTALLABLE_PREFIX@
 
--- mercury-compiler-0.13.1.orig/configure	2007-01-07 16:27:24.000000000 +1300
+++ mercury-compiler-0.13.1/configure	2007-01-13 07:47:11.000000000 +1300
@@ -1609,7 +1609,7 @@
 
 
 PREFIX="`$CYGPATH $PREFIX`"
-LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
+LIBDIR="`$CYGPATH $libdir/mercury-$PACKAGE_VERSION`"
 NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
 
 
--- mercury-compiler-0.13.1.orig/scripts/Mmake.vars.in	2006-11-03 18:42:28.000000000 +1300
+++ mercury-compiler-0.13.1/scripts/Mmake.vars.in	2007-01-13 12:54:16.000000000 +1300
@@ -714,21 +714,21 @@
 # script (e.g. in the shell scripts mmc, ml, mmake, etc) that will not
 # be updated simply by overriding INSTALL_PREFIX.
 
-INSTALL_PREFIX		= @prefix@
-FINAL_INSTALL_PREFIX	= @prefix@
-INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
-INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
-FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
-INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
-INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
-INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
-INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
-INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
-INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
+INSTALL_PREFIX		=
+FINAL_INSTALL_PREFIX	=
+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
+INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/@prefix@/info
+INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
+INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
+INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
+INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
+INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/@prefix@/man
+INSTALL_HTML_DIR	= $(INSTALL_LIBDIR)/html
+INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
+INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
 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)