[project @ 2001-07-13 11:48:52 by rrt]

Don't use relative #include paths, as these files will be compiled from
inside cbits (they're now linked into the cbits library). All paths on which
include files may be found must now be given with -I directives.

diff --git a/ghc/lib/std/CPUTime.hsc b/ghc/lib/std/CPUTime.hsc
index 2d0b4cb..da083d7 100644 (file)
--- a/ghc/lib/std/CPUTime.hsc
+++ b/ghc/lib/std/CPUTime.hsc
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- $Id: CPUTime.hsc,v 1.8 2001/07/02 13:08:49 rrt Exp $
+-- $Id: CPUTime.hsc,v 1.9 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1995-2001
 --
@@ -23,7 +23,7 @@ import PrelArrExtra     ( unsafeFreezeByteArray )
 import PrelIOBase      ( IOException(..) )
 import Ratio
 
-#include "cbits/HsStd.h"
+#include "HsStd.h"
 
 -- -----------------------------------------------------------------------------
 -- Computation `getCPUTime' returns the number of picoseconds CPU time

diff --git a/ghc/lib/std/Directory.hsc b/ghc/lib/std/Directory.hsc
index 101ff22..1ce5844 100644 (file)
--- a/ghc/lib/std/Directory.hsc
+++ b/ghc/lib/std/Directory.hsc
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- $Id: Directory.hsc,v 1.12 2001/06/13 17:01:37 rrt Exp $
+-- $Id: Directory.hsc,v 1.13 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1994-2000
 --
@@ -65,7 +65,7 @@ import PrelPtr
 import PrelIOBase
 import PrelBase
 
-#include "../includes/config.h"
+#include "config.h"
 #include <sys/stat.h>
 #include <dirent.h>
 #include <limits.h>

diff --git a/ghc/lib/std/PrelHandle.hsc b/ghc/lib/std/PrelHandle.hsc
index c50fb48..58928a2 100644 (file)
--- a/ghc/lib/std/PrelHandle.hsc
+++ b/ghc/lib/std/PrelHandle.hsc
@@ -4,7 +4,7 @@
 #undef DEBUG
 
 -- -----------------------------------------------------------------------------
--- $Id: PrelHandle.hsc,v 1.13 2001/06/29 13:57:08 sewardj Exp $
+-- $Id: PrelHandle.hsc,v 1.14 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1994-2001
 --
@@ -40,7 +40,7 @@ module PrelHandle (
 
  ) where
 
-#include "cbits/HsStd.h"
+#include "HsStd.h"
 
 import Monad
 

diff --git a/ghc/lib/std/PrelIO.hsc b/ghc/lib/std/PrelIO.hsc
index 637d64f..867c8b6 100644 (file)
--- a/ghc/lib/std/PrelIO.hsc
+++ b/ghc/lib/std/PrelIO.hsc
@@ -3,7 +3,7 @@
 #undef DEBUG_DUMP
 
 -- -----------------------------------------------------------------------------
--- $Id: PrelIO.hsc,v 1.6 2001/06/29 12:45:39 simonmar Exp $
+-- $Id: PrelIO.hsc,v 1.7 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1992-2001
 --
@@ -16,7 +16,7 @@
 
 module PrelIO where
 
-#include "cbits/HsStd.h"
+#include "HsStd.h"
 #include "PrelHandle_hsc.h"
 
 import PrelBase

diff --git a/ghc/lib/std/PrelPosix.hsc b/ghc/lib/std/PrelPosix.hsc
index edb5107..93270e5 100644 (file)
--- a/ghc/lib/std/PrelPosix.hsc
+++ b/ghc/lib/std/PrelPosix.hsc
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-implicit-prelude -optc-DNON_POSIX_SOURCE #-}
 
 -- ---------------------------------------------------------------------------
--- $Id: PrelPosix.hsc,v 1.8 2001/06/29 13:41:43 simonmar Exp $
+-- $Id: PrelPosix.hsc,v 1.9 2001/07/13 11:48:52 rrt Exp $
 --
 -- POSIX support layer for the standard libraries
 --
@@ -10,7 +10,7 @@
 
 module PrelPosix where
 
-#include "cbits/HsStd.h"
+#include "HsStd.h"
 
 import PrelBase
 import PrelNum

diff --git a/ghc/lib/std/Time.hsc b/ghc/lib/std/Time.hsc
index 3b9c62c..d6692f7 100644 (file)
--- a/ghc/lib/std/Time.hsc
+++ b/ghc/lib/std/Time.hsc
@@ -3,7 +3,7 @@
 -- to compile on sparc-solaris.  Blargh.
 
 -- -----------------------------------------------------------------------------
--- $Id: Time.hsc,v 1.15 2001/06/22 12:36:34 rrt Exp $
+-- $Id: Time.hsc,v 1.16 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1995-2001
 --
@@ -92,7 +92,7 @@ module Time
 
      ) where
 
-#include "cbits/HsStd.h"
+#include "HsStd.h"
 
 import Ix
 import Locale