[project @ 2005-03-15 15:11:41 by krasimir]

package.conf.in is changed to the new syntax. The list of exposed modules still
have only one module GHC

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index a99c5bc..fde3a7c 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -742,6 +742,7 @@ coreSyn/CorePrep_HC_OPTS += -auto-all
 ifeq "$(BuildPackageGHC)" "YES"
 
 PACKAGE = ghc
+VERSION = 6.4
 STANDALONE_PACKAGE = YES
 PACKAGE_DEPS =
 

diff --git a/ghc/compiler/package.conf.in b/ghc/compiler/package.conf.in
index 9c5ba80..98957da 100644 (file)
--- a/ghc/compiler/package.conf.in
+++ b/ghc/compiler/package.conf.in
@@ -1,10 +1,18 @@
-Package {
-        name           = PACKAGE,
-       auto           = False,
+name:          PACKAGE
+version:       VERSION
+license:       BSD3
+maintainer:    glasgow-haskell-users@haskell.org
+exposed:       True
+
+exposed-modules:
+    GHC
+    
+hidden-modules:
+
 #ifdef INSTALLING
-       import_dirs    = [ "$libdir/ghc-package" ],
+import-dirs:   "$libdir/ghc-package"
 #else
-       import_dirs    = [ FPTOOLS_TOP_ABS"/ghc/compiler/stage1/utils",
+import-dirs:   FPTOOLS_TOP_ABS"/ghc/compiler/stage1/utils",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/basicTypes",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/types",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/hsSyn",
@@ -25,25 +33,19 @@ Package {
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/cprAnalysis",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/compMan",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/ndpFlatten",
-                          FPTOOLS_TOP_ABS"/ghc/compiler/stage1/cbits",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/iface",
                           FPTOOLS_TOP_ABS"/ghc/compiler/stage1/cmm",
-                          FPTOOLS_TOP_ABS"/ghc/compiler/stage1/nativeGen" ],
+                          FPTOOLS_TOP_ABS"/ghc/compiler/stage1/nativeGen"
 #endif
-        source_dirs    = [],
+
 #ifdef INSTALLING
-        library_dirs   = [ "$libdir" ],
+library-dirs: "$libdir",
 #else
-        library_dirs   = [ FPTOOLS_TOP_ABS"/ghc/compiler" ],
+library-dirs: FPTOOLS_TOP_ABS"/ghc/compiler"
 #endif
 
-        hs_libraries    = [ LIBRARY ],
-       extra_libraries = [],
-        c_includes      = [],
-        package_deps    = [ "base", "haskell98" ],
-               /* PACKAGE_DEPS doesn't work quite right here - it leaves
-                  a trailing comma */
-        extra_ghc_opts  = [],
-        extra_cc_opts   = [],
-        extra_ld_opts   = []
-}
+hs-libraries: LIBRARY
+
+extra-libraries:
+
+package_deps: "base", "haskell98"