--- mercury-compiler-0.12.2.orig/Mmakefile	2005-01-28 20:11:29.000000000 +1300
+++ mercury-compiler-0.12.2/Mmakefile	2006-08-12 09:45:55.000000000 +1200
@@ -233,6 +233,54 @@
 		mdbcomp browser trace
 	+cd deep_profiler && $(SUBDIR_MMAKE)
 
+libgrades:
+	+for grade in x $(LIBGRADES); do				\
+	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
+		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
+		TWS=`/bin/pwd`/libgrades/$$grade;			\
+		/bin/rm -fr libgrades/$$grade;				\
+		mkdir -p libgrades/$$grade;				\
+		( scripts/prepare_tmp_dir_fixed_part $$grade &&		\
+		  scripts/prepare_tmp_dir_grade_part $$grade ) &&	\
+	        ( cd libgrades/$$grade/boehm_gc &&			\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
+			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		( cd libgrades/$$grade/runtime &&			\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		( cd libgrades/$$grade/library &&			\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			depend &&					\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		( cd libgrades/$$grade/mdbcomp &&			\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			depend &&					\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		( cd libgrades/$$grade/browser &&			\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			depend &&					\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		( cd libgrades/$$grade/trace &&				\
+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
+			libgrade ) &&					\
+		true ||							\
+		  exit 1;						\
+	    fi;								\
+	done
+
 #-----------------------------------------------------------------------------#
 
 .PHONY: tags
@@ -429,28 +477,13 @@
 	@echo
 	@echo "-- Installation complete."
 	@echo
-	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
-	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
-	@echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
-	@if test $(ENABLE_DEEP_PROFILER) != yes || \
-		cmp -s deep_profiler/mdprof_cgi \
-			$(INSTALL_CGI_DIR)/mdprof_cgi; \
-	then true ; else \
-		echo "-- to copy deep_profiler/mdprof_cgi" \
-			"to $(INSTALL_CGI_DIR),"; \
-	fi
-	@echo "-- and to add the following lines to the \`.emacs' file"
-	@echo "-- in your home directory:"
-	@echo "	(setq load-path (cons (expand-file-name "
-	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
-	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
 
 .PHONY: install_main
 install_main: all \
 		install_scripts install_util install_runtime install_boehm_gc \
 		install_library install_mdbcomp install_browser install_trace \
 		install_compiler install_profiler install_deep_profiler \
-		install_doc install_config
+		install_doc
 
 .PHONY: install_scripts
 install_scripts: scripts
@@ -511,7 +544,7 @@
 #	.trans_opt .trans_opt_date .d .mh .mih .c_date  .c .o .pic_o
 
 .PHONY: install_grades
-install_grades: all
+install_grades: all libgrades
 	#
 	# Use the newly installed compiler to build the libraries
 	# in various different grades.  We need to override MC=mmc
@@ -519,44 +552,33 @@
 	# runs the newly installed compiler, rather than using the
 	# bootstrap compiler.
 	#
-	/bin/rm -fr tmp_dir
-	scripts/prepare_tmp_dir_fixed_part
 	+for grade in x $(LIBGRADES); do				\
 	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
 		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
-		TWS=`/bin/pwd`/tmp_dir;					\
-		scripts/prepare_tmp_dir_grade_part;			\
-	        ( cd tmp_dir/boehm_gc &&				\
+		TWS=`/bin/pwd`/libgrades/$$grade;			\
+	        ( cd libgrades/$$grade/boehm_gc &&			\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
 			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
 			install_lib ) &&				\
-		( cd tmp_dir/runtime &&					\
+		( cd libgrades/$$grade/runtime &&			\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
 			install_lib ) &&				\
-		( cd tmp_dir/library &&					\
-		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-			depend &&					\
+		( cd libgrades/$$grade/library &&			\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
 			install_library ) &&				\
-		( cd tmp_dir/mdbcomp &&					\
-		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-			depend &&					\
+		( cd libgrades/$$grade/mdbcomp &&			\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
 			install_library ) &&				\
-		( cd tmp_dir/browser &&					\
-		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-			depend &&					\
+		( cd libgrades/$$grade/browser &&			\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
 			install_library ) &&				\
-		( cd tmp_dir/trace &&					\
+		( cd libgrades/$$grade/trace &&				\
 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
 			install_lib ) &&				\
 		true ||							\
-		{ echo "To clean up from failed install, remove tmp_dir"; \
-		  exit 1; };						\
+		  exit 1;						\
 	    fi;								\
 	done
-	if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi
 
 .PHONY: install_split_library
 install_split_library: scripts dep_library
--- mercury-compiler-0.12.2.orig/boehm_gc/Mmakefile	2004-10-19 19:01:36.000000000 +1300
+++ mercury-compiler-0.12.2/boehm_gc/Mmakefile	2006-07-29 09:07:33.000000000 +1200
@@ -90,6 +90,9 @@
 .PHONY: force
 force:
 
+.PHONY: libgrade
+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
+
 #-----------------------------------------------------------------------------#
 
 # installation rules
--- mercury-compiler-0.12.2.orig/browser/Mmakefile	2005-01-28 20:11:37.000000000 +1300
+++ mercury-compiler-0.12.2/browser/Mmakefile	2006-07-29 09:19:39.000000000 +1200
@@ -180,6 +180,11 @@
 .PHONY: int3s 
 int3s:	$(INT3S_TARGETS)
 
+.PHONY: libgrade
+libgrade: \
+		lib$(BROWSER_LIB_NAME).$A \
+		lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+
 #-----------------------------------------------------------------------------#
 
 tags:	$(MTAGS) $($(BROWSER_LIB_NAME).ms)
--- mercury-compiler-0.12.2.orig/library/Mmakefile	2005-05-06 20:01:58.000000000 +1200
+++ mercury-compiler-0.12.2/library/Mmakefile	2006-07-29 10:31:06.000000000 +1200
@@ -194,6 +194,9 @@
 trans_opts: $(STD_LIB_NAME).trans_opts
 $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts)
 
+.PHONY: libgrade
+libgrade: lib$(STD_LIB_NAME)
+
 #-----------------------------------------------------------------------------#
 
 tags:	$(MTAGS) $($(STD_LIB_NAME).ms)
--- mercury-compiler-0.12.2.orig/mdbcomp/Mmakefile	2005-02-17 19:39:24.000000000 +1300
+++ mercury-compiler-0.12.2/mdbcomp/Mmakefile	2006-07-29 09:18:15.000000000 +1200
@@ -147,6 +147,13 @@
 .PHONY: int3s 
 int3s:	$(INT3S_TARGETS)
 
+.PHONY: libgrade
+libgrade: \
+		$(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \
+		lib$(MDBCOMP_LIB_NAME).$A \
+		lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
+		all-ints
+
 #-----------------------------------------------------------------------------#
 
 tags:	$(MTAGS) $($(MDBCOMP_LIB_NAME).ms)
--- mercury-compiler-0.12.2.orig/runtime/Mmakefile	2005-12-05 16:34:46.000000000 +1300
+++ mercury-compiler-0.12.2/runtime/Mmakefile	2006-07-29 09:11:09.000000000 +1200
@@ -376,6 +376,9 @@
 	@if test ! -f tags; then echo making tags; \
 	ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi
 
+.PHONY: libgrade
+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+
 #-----------------------------------------------------------------------------#
 
 # installation rules
--- mercury-compiler-0.12.2.orig/scripts/prepare_tmp_dir_fixed_part.in	2005-01-28 20:11:59.000000000 +1300
+++ mercury-compiler-0.12.2/scripts/prepare_tmp_dir_fixed_part.in	2006-08-11 21:20:06.000000000 +1200
@@ -12,18 +12,20 @@
 fi
 wd=`/bin/pwd`
 
-mkdir tmp_dir
-cp Mmake* tmp_dir
-cp Mercury.* tmp_dir
-cp VERSION tmp_dir
-cp config* tmp_dir
-cp aclocal.m4 tmp_dir
-mkdir tmp_dir/scripts
-cp scripts/* tmp_dir/scripts
-mkdir tmp_dir/tools
-cp tools/* tmp_dir/tools
-$ln_s $wd/compiler tmp_dir
-$ln_s $wd/analysis tmp_dir
-$ln_s $wd/robdd tmp_dir
-$ln_s $wd/util tmp_dir
+libgrade_dir=libgrades/$1
+
+mkdir -p $libgrade_dir
+cp Mmake* $libgrade_dir
+cp Mercury.* $libgrade_dir
+cp VERSION $libgrade_dir
+cp config* $libgrade_dir
+cp aclocal.m4 $libgrade_dir
+mkdir $libgrade_dir/scripts
+cp scripts/* $libgrade_dir/scripts
+mkdir $libgrade_dir/tools
+cp tools/* $libgrade_dir/tools
+$ln_s $wd/compiler $libgrade_dir
+$ln_s $wd/analysis $libgrade_dir
+$ln_s $wd/robdd $libgrade_dir
+$ln_s $wd/util $libgrade_dir
 exit 0
--- mercury-compiler-0.12.2.orig/scripts/prepare_tmp_dir_grade_part	2005-01-28 20:11:59.000000000 +1300
+++ mercury-compiler-0.12.2/scripts/prepare_tmp_dir_grade_part	2006-07-29 09:01:18.000000000 +1200
@@ -5,47 +5,49 @@
 # Public License - see the file COPYING in the Mercury distribution.
 #---------------------------------------------------------------------------#
 
-rm -fr tmp_dir/boehm_gc
-rm -fr tmp_dir/runtime
-rm -fr tmp_dir/trace
-rm -fr tmp_dir/library
-rm -fr tmp_dir/mdbcomp
-rm -fr tmp_dir/browser
-mkdir tmp_dir/boehm_gc
-mkdir tmp_dir/boehm_gc/Mac_files
-mkdir tmp_dir/boehm_gc/cord
-mkdir tmp_dir/boehm_gc/include
-mkdir tmp_dir/boehm_gc/include/private
-cp boehm_gc/Makefile* tmp_dir/boehm_gc
-cp boehm_gc/Mmake* tmp_dir/boehm_gc
-cp boehm_gc/ac* tmp_dir/boehm_gc
-cp boehm_gc/*.[chsS] tmp_dir/boehm_gc
-cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files
-cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord
-cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include
-cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private
-mkdir tmp_dir/runtime
-mkdir tmp_dir/runtime/machdeps
-cp runtime/Mmake* tmp_dir/runtime
-cp runtime/*.in tmp_dir/runtime
-cp runtime/*.[ch] tmp_dir/runtime
-cp runtime/*.il tmp_dir/runtime
-cp runtime/machdeps/*.h tmp_dir/runtime/machdeps
-mkdir tmp_dir/trace
-cp trace/Mmake* tmp_dir/trace
-cp trace/*.[ch] tmp_dir/trace
-mkdir tmp_dir/library
-cp library/Mmake* tmp_dir/library
-cp library/Mercury.* tmp_dir/library
-cp library/print_extra_inits tmp_dir/library
-cp library/library_strong_name.sn tmp_dir/library
-cp library/*.m tmp_dir/library
-mkdir tmp_dir/mdbcomp
-cp mdbcomp/Mmake* tmp_dir/mdbcomp
-cp mdbcomp/Mercury.* tmp_dir/mdbcomp
-cp mdbcomp/*.m tmp_dir/mdbcomp
-mkdir tmp_dir/browser
-cp browser/Mmake* tmp_dir/browser
-cp browser/Mercury.* tmp_dir/browser
-cp browser/*.m tmp_dir/browser
+libgrade_dir=libgrades/$1
+
+rm -fr $libgrade_dir/boehm_gc
+rm -fr $libgrade_dir/runtime
+rm -fr $libgrade_dir/trace
+rm -fr $libgrade_dir/library
+rm -fr $libgrade_dir/mdbcomp
+rm -fr $libgrade_dir/browser
+mkdir $libgrade_dir/boehm_gc
+mkdir $libgrade_dir/boehm_gc/Mac_files
+mkdir $libgrade_dir/boehm_gc/cord
+mkdir $libgrade_dir/boehm_gc/include
+mkdir $libgrade_dir/boehm_gc/include/private
+cp boehm_gc/Makefile* $libgrade_dir/boehm_gc
+cp boehm_gc/Mmake* $libgrade_dir/boehm_gc
+cp boehm_gc/ac* $libgrade_dir/boehm_gc
+cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc
+cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files
+cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord
+cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include
+cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private
+mkdir $libgrade_dir/runtime
+mkdir $libgrade_dir/runtime/machdeps
+cp runtime/Mmake* $libgrade_dir/runtime
+cp runtime/*.in $libgrade_dir/runtime
+cp runtime/*.[ch] $libgrade_dir/runtime
+cp runtime/*.il $libgrade_dir/runtime
+cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps
+mkdir $libgrade_dir/trace
+cp trace/Mmake* $libgrade_dir/trace
+cp trace/*.[ch] $libgrade_dir/trace
+mkdir $libgrade_dir/library
+cp library/Mmake* $libgrade_dir/library
+cp library/Mercury.* $libgrade_dir/library
+cp library/print_extra_inits $libgrade_dir/library
+cp library/library_strong_name.sn $libgrade_dir/library
+cp library/*.m $libgrade_dir/library
+mkdir $libgrade_dir/mdbcomp
+cp mdbcomp/Mmake* $libgrade_dir/mdbcomp
+cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp
+cp mdbcomp/*.m $libgrade_dir/mdbcomp
+mkdir $libgrade_dir/browser
+cp browser/Mmake* $libgrade_dir/browser
+cp browser/Mercury.* $libgrade_dir/browser
+cp browser/*.m $libgrade_dir/browser
 exit 0
--- mercury-compiler-0.12.2.orig/trace/Mmakefile	2005-01-28 20:12:05.000000000 +1300
+++ mercury-compiler-0.12.2/trace/Mmakefile	2006-07-29 09:22:09.000000000 +1200
@@ -179,6 +179,9 @@
 	@if test ! -f tags; then echo making tags; \
 	ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi
 
+.PHONY: libgrade
+libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+
 #-----------------------------------------------------------------------------#
 
 # installation rules