projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-03-07 10:23:03 by rrt]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
efb315b
..
2982a09
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-295,6
+295,9
@@
LibsReadline=@LibsReadline@
#
ReadlineIncludePath=
#
ReadlineIncludePath=
+# Math library
+LIBM=@LIBM@
+
# Build the Haskell OpenGL/GLUT binding?
#
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
# Build the Haskell OpenGL/GLUT binding?
#
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@
-396,10
+399,10
@@
endif
FPTOOLS_TOP_ABS = @hardtop@
ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
FPTOOLS_TOP_ABS = @hardtop@
ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
-FPTOOLS_TOP_ABS = $(patsubst /cygdrive/%/,%:/,@hardtop@)
+FPTOOLS_TOP_ABS = $(subst \,/,$(shell cygpath -w @hardtop@))
endif
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
endif
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-FPTOOLS_TOP_ABS = $(patsubst /cygdrive/%/,%:/,@hardtop@)
+FPTOOLS_TOP_ABS = $(subst \,/,$(shell cygpath -w @hardtop@))
endif
#
endif
#
@@
-733,7
+736,7
@@
HAPPY_VERSION = @HappyVersion@
#
# Options to pass to Happy when we're going to compile the output with GHC
#
#
# 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
#
# Stuff from fptools/literate