[m-rev.] diff: fix mmake bug

Ian MacLarty maclarty at cs.mu.OZ.AU
Thu Dec 1 01:54:50 AEDT 2005


Estimated hours taken: 0.3
Branches: main

scripts/mmake.in:
	Fix a bug introduced by Peter where the command `mmake <target>' just
	hangs if there is no Mmakefile.  The problem was that cat was being
	called with no arguments, causing it to wait for input from stdin.

Index: scripts/mmake.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmake.in,v
retrieving revision 1.48
diff -u -r1.48 mmake.in
--- scripts/mmake.in	13 Nov 2005 08:51:53 -0000	1.48
+++ scripts/mmake.in	30 Nov 2005 14:47:47 -0000
@@ -373,7 +373,7 @@
 {
 cat ${MMAKE_VARS}
 echo $dvs | xargs cat
-cat $include_makefile $MMAKEFILE
+echo $include_makefile $MMAKEFILE | xargs cat
 echo 'ifneq ($(MMAKE_AUTO_INCLUDE_DS),no)'
 echo $ds | xargs cat
 echo 'endif'
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list