[project @ 2002-02-06 11:51:12 by simonmar]

- change package name to "base"
- make GHC/PrimopWrappers work.

diff --git a/Makefile b/Makefile
index 96e1c73..f173dbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.9 2002/02/05 17:32:24 simonmar Exp $
+# $Id: Makefile,v 1.10 2002/02/06 11:51:12 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -36,7 +36,7 @@ ALL_DIRS = \
        Text/Regex \
        Text/Show
 
-PKG=core
+PKG = base
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -45,7 +45,7 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
        rm -f $@
        $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
-boot :: GHC/PrimOpWrappers.hs
+boot :: GHC/PrimopWrappers.hs
 
 CLEAN_FILES += GHC/PrimopWrappers.hs
 

diff --git a/core.conf.in b/base.conf.in
similarity index 68%
rename from core.conf.in
rename to base.conf.in
index 0d17573..0a6a74b 100644 (file)
--- a/core.conf.in
+++ b/base.conf.in
@@ -1,30 +1,30 @@
 #include "config.h"
 
 Package {
-        name           = "core",
+        name           = "base",
 #ifdef INSTALLING
        import_dirs    = [ "$libdir/imports" ]
 #else
-       import_dirs    = [ "$libdir/libraries/core" ],
+       import_dirs    = [ "$libdir/libraries/base" ],
 #endif
         source_dirs    = [],
 #ifdef INSTALLING
         library_dirs   = [ "$libdir" ]
 #else
-        library_dirs   = [ "$libdir/libraries/core"
-                         , "$libdir/libraries/core/cbits" ],
+        library_dirs   = [ "$libdir/libraries/base"
+                         , "$libdir/libraries/base/cbits" ],
 #endif
         hs_libraries      =
 #                           ifndef mingw32_TARGET_OS
-                            [ "HScore" ],
+                            [ "HSbase" ],
 #                           else
                             -- This splitting is the subject of a totally 
                             -- horrible hack, which glues HSstd1 and HSstd2 
                             -- back into HSstd for the purposes of static linking.
                             -- See DriverState.getPackageLibraries for details.
-                            [ "HScore1", "HScore2" ],
+                            [ "HSbase1", "HSbase2" ],
 #                           endif
-       extra_libraries   = [ "HScore_cbits"
+       extra_libraries   = [ "HSbase_cbits"
 #ifdef mingw32_TARGET_OS
                             , "wsock32", "msvcrt", "kernel32", "user32"
 #endif
@@ -32,9 +32,9 @@ Package {
 #ifdef INSTALLING
         include_dirs   = []
 #else
-        include_dirs   = [ "$libdir/libraries/core/include" ],
+        include_dirs   = [ "$libdir/libraries/base/include" ],
 #endif
-        c_includes     = [ "HsCore.h" ],
+        c_includes     = [ "HsBase.h" ],
         package_deps   = [ "rts" ],
         extra_ghc_opts = [],
         extra_cc_opts  = [],