From: keller <unknown>
Date: Tue, 4 Dec 2001 04:54:26 +0000 (+0000)
Subject: [project @ 2001-12-04 04:54:26 by keller]
X-Git-Tag: Approximately_9120_patches~475
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=c3c0cd456206940c81b90888829e2d9767de5610;p=ghc-hetmet.git

[project @ 2001-12-04 04:54:26 by keller]
Sets the X11 C compiler and linker flags for package xlib correctly now
---

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index cd2a720..a7667bf 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -22,7 +22,11 @@ PKGCONF_OPTS = "$(TARGETPLATFORM)"		\
 	       "$(GHC_LIB_DIR)"			\
 	       "$(GHC_RUNTIME_DIR)"		\
 	       "$(GHC_UTILS_DIR)"		\
-	       "$(GHC_INCLUDE_DIR)"
+	       "$(GHC_INCLUDE_DIR)"		\
+	       "$(X_CFLAGS)"			\
+	       "$(X_LIBS)"
+
+# the latter two are needed to setup the package details for hslibs/xlib
 
 SRC_HC_OPTS += -fglasgow-exts -cpp 
 
diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index 465047b..eab4a01 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -35,6 +35,8 @@ package_details installing
  , cGHC_RUNTIME_DIR
  , cGHC_UTILS_DIR
  , cGHC_INCLUDE_DIR
+ , cX_CFLAGS
+ , cX_LIBS
  ] =
 
  [
@@ -427,8 +429,8 @@ package_details installing
          c_includes     = [ "HsXlib.h" ],
          package_deps   = [ "greencard" ],
          extra_ghc_opts = [],
-         extra_cc_opts  = [],
-         extra_ld_opts  = []
+         extra_cc_opts  = [ cX_CFLAGS ],
+         extra_ld_opts  = [ cX_LIBS ]
         }
 
          ,Package {
@@ -437,7 +439,9 @@ package_details installing
                              then [ "$libdir/imports/HGL" ]
                              else [ "$libdir/hslibs/graphics/lib/x11" ],
          source_dirs    = [],
-         library_dirs   = [],
+         library_dirs   = if installing
+                             then [ "$libdir" ]
+                             else [ "$libdir/hslibs/graphics/lib/x11"],
          hs_libraries   = [ "HSHGL" ],
 	 extra_libraries= [],
          include_dirs   = [],