Windows Install modification.

2 files changed, 17 insertions, 24 deletions

diff --git a/INSTALL b/INSTALL
index 8711ed5..91397d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,39 +15,27 @@ INSTALLATION ON WINDOWS ----------------------------------------
 
 1) Install the Haskell Platform (tested with 2009.2.0.2).
 
-2) Download and uncompress in a temporary location the following file:
+2) Download and uncompress hmatrix-x.y.z.tar.gz from Hackage:
 
-   http://code.haskell.org/hmatrix/gsl-lapack-windows.zip
-
-   It contains a gsl folder, and four DLL's.
-
-3) Move the gsl folder to
-
-   C:\Program Files\Haskell Platform\2009.2.0.2\include
-
-4) Move the four DLL's to any folder without spaces in the path, e.g.:
+   http://hackage.haskell.org/package/hmatrix
 
-   C:\path\to\dll
+3) Download and uncompress the following file into the hmatrix
+   directory, into a subdirectory named gsl-lapack-windows:
 
-5) Download and uncompress hmatrix-x.y.z.tar.gz from Hackage:
+   http://code.haskell.org/hmatrix/gsl-lapack-windows.zip
 
-   http://hackage.haskell.org/package/hmatrix
+   It contains a gsl folder, and four DLL's.
 
-6) Edit hmatrix.cabal:
+4) Edit hmatrix.cabal:
 
      line 17:      build-type:         Custom
      change to:    build-type:         Simple
-
-     and at the end of the file add:
-
-        extra-libraries: libgsl-0 blas lapack
-        extra-lib-dirs: C:\path\to\dll
-
-7) Open a terminal, cd to the hmatrix folder, and run
+   
+5) Open a terminal, cd to the hmatrix folder, and run
 
    > cabal install
 
-8) If everything is ok we can run the tests:
+6) If everything is ok we can run the tests:
 
    > runhaskell examples\tests.hs
 
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 894bff0..dfb3c6a 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -65,7 +65,7 @@ flag unsafe
 
 library
 
-    Build-Depends:      base >= 3 && < 5,
+    Build-Depends:      base >= 4 && < 5,
                         array,
                         storable-complex,
                         process
@@ -140,14 +140,19 @@ library
         include-dirs: /opt/local/include
         extra-libraries: gsl
         frameworks: Accelerate
+        
+    if os(windows)
+        extra-libraries: libgsl-0 blas lapack
+        extra-lib-dirs: ./gsl-lapack-windows
+        include-dirs: ./gsl-lapack-windows
 
 -- The extra-libraries required for GSL and LAPACK
 -- should now be automatically detected by configure(.hs)
 
+
     extra-libraries:
     extra-lib-dirs:
 
     source-repository head
         type:     darcs
         location: http://code.haskell.org/hmatrix
-