From: sof <unknown>
Date: Wed, 19 Mar 1997 04:50:04 +0000 (+0000)
Subject: [project @ 1997-03-19 04:50:02 by sof]
X-Git-Tag: Approximately_1000_patches_recorded~776
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c399df70adc01df586e0bd8fa6e2880fdc643791;hp=b8829277b469221f0b5e6ae49f309ed845666732;p=ghc-hetmet.git

[project @ 1997-03-19 04:50:02 by sof]
look for readline.h, BOOT_SRCS fix, HAPPY default setting
---

diff --git a/mk/config.h.in b/mk/config.h.in
index 61354bd..e2a88cc 100644
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -84,6 +84,9 @@
 /* Define if you have the <pwd.h> header file.  */
 #undef HAVE_PWD_H
 
+/* Define if you have the <readline/readline.h> header file. */
+#undef HAVE_READLINE_READLINE_H
+
 /* Define if you have the <siginfo.h> header file.  */
 #undef HAVE_SIGINFO_H
 
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0cc939b..d94ba3d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -180,7 +180,7 @@ GhcLibHcOpts= -split-objs -odir $(basename $*)
 
 # Build the Haskell Readline bindings?
 #
-HsLibsWithReadline=YES
+HsLibsWithReadline=NO
 #
 # Include path to readline.h
 # (no path == in standard include path)
@@ -516,7 +516,7 @@ RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 LX			= @LxCmd@
 
-ifneq "$(HAPPY)" ""
+ifeq "$(HAPPY)" ""
 HAPPY			= $(HAPPY_PREFIX)happy
 endif
 
diff --git a/mk/paths.mk b/mk/paths.mk
index fed38d2..8fdbae9 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -155,7 +155,17 @@ INSTALL_BIN_OPTS  = \
 
 SRCS=$(wildcard *.lhs *.hs *.c *.lc *.prl *.lprl *.lit *.verb)
 
-HS_SRCS=$(filter %.lhs %.hs %.hc,$(SRCS))$(BOOT_SRCS)
+HS_SRCS=$(filter %.lhs %.hs %.hc,$(SRCS))
+#
+# Do not include BOOT_SRCS in the HS_SRCS defn above,
+# since this will make HS_SRCS always be non-empty,
+# which breaks rules like `depend'. Price is that
+# you have to define BOOT_SRCS before including
+# boilerplate.mk
+#
+ifneq "$(BOOT_SRCS)" ""
+HS_SRCS+=$(BOOT_SRCS)
+endif
 HS_OBJS=$(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
 HS_IFACES=$(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))