[m-dev.] diff: GCC back-end: rename cc1mercury as mercury1 (part 2)

[Fergus Henderson]

Estimated hours taken: 2

gcc/mercury/lang-specs.h:
gcc/mercury/Makefile:
gcc/mercury/Mmakefile:
	Some additional changes required to handle the renaming
	of `gcc/mercury/cc1mercury' as `gcc/mercury1'.

----------

The 2 hours here was mostly spent trying to debug a problem that had
already been fixed, but was still showing up because I was running
the wrong executable (!%!@$!), since I hadn't changed lang-specs.h.

----------

Workspace: /home/hg/fjh/gcc-cvs/gcc
Index: gcc/mercury/lang-specs.h
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/lang-specs.h,v
retrieving revision 1.2
diff -u -d -u -r1.2 lang-specs.h
--- gcc/mercury/lang-specs.h	2001/01/10 10:02:20	1.2
+++ gcc/mercury/lang-specs.h	2001/01/15 15:12:17
@@ -24,5 +24,5 @@
   {".mer",    "@mercury" },
   {".m",      "@mercury" },
   {"@mercury",
-   "%{!E:cc1mercury %i %(cc1mercury) %(cc1_options) %{I*}\
+   "%{!E:mercury1 %i %(mercury1) %(cc1_options) %{I*}\
              %{!fsyntax-only:%(invoke_as)}}"},
Index: gcc/mercury/Makefile
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/Makefile,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile
--- gcc/mercury/Makefile	2000/12/20 18:10:51	1.2
+++ gcc/mercury/Makefile	2001/01/15 14:57:08
@@ -3,8 +3,8 @@
 mercury: force
 	cd ..; make mercury
 
-cc1mercury: force
-	cd ..; make mercury/cc1mercury
+../mercury1: force
+	cd ..; make mercury1
 
 check: force
 	cd ..; make check-mercury
Index: gcc/mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/Mmakefile,v
retrieving revision 1.2.2.1
diff -u -d -r1.2.2.1 Mmakefile
--- gcc/mercury/Mmakefile	2001/01/14 09:28:25	1.2.2.1
+++ gcc/mercury/Mmakefile	2001/01/16 02:22:45
@@ -14,7 +14,7 @@
 GRADE = hlc.gc
 
 
-GCC = ../xgcc -B./ -B../
+GCC = ../xgcc -B../
 CC = $(GCC)
 
 # GMCFLAGS = -O2 -fomit-frame-pointer

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------