[m-rev.] diff: remove bash dependency in tests/debugger/Mmakefile
Simon Taylor
stayl at cs.mu.OZ.AU
Thu May 2 04:05:29 AEST 2002
Estimated hours taken: 0.1
Branches: main
tests/debugger/Mmakefile:
Use a shell function to expand out command substitution in
an Mmake variable, instead of $(...) style command substitution
which requires the use of bash.
MCFLAGS is now included in MC_MAKE_FLAGS, so don't include
it a second time in the flags passed to the compiler used
to compile the query for the `interactive' test case.
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.73
diff -u -u -r1.73 Mmakefile
--- Mmakefile 29 Apr 2002 08:22:05 -0000 1.73
+++ Mmakefile 1 May 2002 18:02:50 -0000
@@ -305,15 +305,10 @@
USE_SUBDIRS_OPT =
endif
-# We need $(...) style command substitution for the rule below.
-# (MC_MAKE_FLAGS can contain `...` style command substitution,
-# which can't be nested).
-SHELL=/usr/local/bin/bash
-
interactive.out.orig: interactive interactive.inp $(interactive.ints)
echo "echo on" > interactive.inp.tmp
echo mmc_options $(USE_SUBDIRS_OPT) \
- $$(echo $(MC_MAKE_FLAGS) $(ALL_MCFLAGS)) \
+ $(shell echo $(ALL_MC_MAKE_FLAGS)) \
--trace minimum >> interactive.inp.tmp
cat interactive.inp >> interactive.inp.tmp
$(MDB) ./interactive < interactive.inp.tmp > interactive.out.orig 2>&1
--------------------------------------------------------------------------
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