[project @ 2001-07-16 21:01:58 by qrczak]

Follow the s/includes/include/ change in package.conf.

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index 1481c35..a650ca9 100644 (file)
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.14 2000/12/08 11:47:00 rrt Exp $
+# $Id: Makefile,v 1.15 2001/07/16 21:01:58 qrczak Exp $
 #
 
 TOP = ..
@@ -88,7 +88,7 @@ boot :: all
 # (ditto for interface files). This is not *really* needed, but
 # it gives (perhaps) a cleaner binary dist structure..might change.
 #
-override datadir:=$(libdir)/includes
+override datadir:=$(libdir)/include
 INSTALL_DATAS += $(H_FILES) $(H_CONFIG)
 
 #

diff --git a/mk/target.mk b/mk/target.mk
index 9d1683a..8f5dd00 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -374,7 +374,7 @@ endif
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR)
 
 ifeq "$(IS_CBITS_LIB)" "YES"
-override datadir:=$(libdir)/includes
+override datadir:=$(libdir)/include
 INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h
 else
 SRC_CC_OPTS += -Icbits