From: simonmar <unknown>
Date: Thu, 20 Jun 2002 16:00:18 +0000 (+0000)
Subject: [project @ 2002-06-20 16:00:18 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1944
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c6671299433ba83865f4be4a8fe88ab9f8c1a36b;p=ghc-hetmet.git

[project @ 2002-06-20 16:00:18 by simonmar]
Add:
	$(ifacedir)		where we install interfaces
	$(HADDOCK_INPLACE)	how to invoke Haddock
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ad682b8..f36f483 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -490,6 +490,10 @@ libdir	   = $(libdir0)
 datadir    = $(datadir0)
 endif
 
+# Default place for putting interface files is $(libdir)
+# (overriden for packages in package.mk)
+ifacedir   = $(libdir)
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular
@@ -599,10 +603,9 @@ LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX		= $(GLAFP_UTILS)/docbook/
 
-LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
+HADDOCK_PREFIX		= $(FPTOOLS_TOP)/haddock/
 
-HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
-GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
+LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
 
 UNLIT_PREFIX    	= $(FPTOOLS_TOP)/ghc/utils/unlit/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
@@ -850,6 +853,11 @@ HAPPY_VERSION		= @HappyVersion@
 GHC_HAPPY_OPTS		= -agc
 
 #
+# Haddock
+# 
+HADDOCK_INPLACE		= $(HADDOCK_PREFIX)/src/haddock-inplace
+
+#
 # Stuff from fptools/literate
 #
 LIT2PGM 		= $(LITERATE_PREFIX)lit2pgm