From: simonmar <unknown>
Date: Thu, 14 Feb 2002 15:14:02 +0000 (+0000)
Subject: [project @ 2002-02-14 15:14:02 by simonmar]
X-Git-Tag: nhc98-1-18-release~1107
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7dae72bf8bf76e9085930bfe402d5d2d1a2875b2;p=haskell-directory.git

[project @ 2002-02-14 15:14:02 by simonmar]
Fixes to 'make install' in fptools/libraries.  We have to maintain the
directory structure when installing the .hi files, rather than just
dumping them in a single directory as we do for packages in
fptools/hslibs.
---

diff --git a/cbits/Makefile b/cbits/Makefile
index 14b18d4..5eda815 100644
--- a/cbits/Makefile
+++ b/cbits/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2002/02/14 14:05:48 simonmar Exp $
+# $Id: Makefile,v 1.7 2002/02/14 15:14:02 simonmar Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -9,7 +9,6 @@ ifneq "$(HavePosixRegex)" "YES"
 ALL_DIRS      += regex
 SRC_CC_OPTS   += -Iregex
 EXCLUDED_SRCS += regex/engine.c
-INSTALL_DATAS += regex/regex.h
 endif
 
 EXCLUDED_SRCS += ilxstubs.c
diff --git a/include/Makefile b/include/Makefile
index 617e229..3784558 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2001/08/17 12:47:47 simonmar Exp $
+# $Id: Makefile,v 1.2 2002/02/14 15:14:02 simonmar Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -9,5 +9,8 @@ H_FILES = $(wildcard *.h)
 override datadir:=$(libdir)/include
 INSTALL_DATAS = $(H_FILES)
 
-include $(TOP)/mk/target.mk
+ifneq "$(HavePosixRegex)" "YES"
+INSTALL_DATAS += ../cbits/regex/regex.h
+endif
 
+include $(TOP)/mk/target.mk