From: simonmar Date: Mon, 19 Feb 2001 12:35:31 +0000 (+0000) Subject: [project @ 2001-02-19 12:35:31 by simonmar] X-Git-Tag: Approximately_9120_patches~2600 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=323d8c13143273beeca0c4fa91af4a0623cb5551;p=ghc-hetmet.git [project @ 2001-02-19 12:35:31 by simonmar] fix the GHC_HAPPY_OPTS hack to correctly detect happy 1.10 --- diff --git a/mk/config.mk.in b/mk/config.mk.in index fdc8fdb..bf76828 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -736,7 +736,7 @@ HAPPY_VERSION = @HappyVersion@ # # Options to pass to Happy when we're going to compile the output with GHC # -GHC_HAPPY_OPTS = $(shell if expr $(HAPPY_VERSION) \< "1.8" >/dev/null; then echo -g; else echo -agc; fi) +GHC_HAPPY_OPTS = $(shell if ( test `echo $(HAPPY_VERSION) | sed -e "s/\(.*\)\..*/\1/g"` "-gt" "1" || test `echo $(HAPPY_VERSION) | sed -e "s/.*\.\(.*\)/\1/g"` "-ge" "9" ); then echo -agc; else echo -g; fi) # # Stuff from fptools/literate