2 files changed, 16 insertions, 12 deletions

diff --git a/README b/README
index 9fb478b..54495d7 100644
--- a/README
+++ b/README
@@ -159,22 +159,26 @@ INSTALLATION ON WINDOWS ----------------------------------------
    These headers are also available from:
        http://perception.inf.um.es/~aruiz/darcs/hmatrix/gsl.zip
 
-2) Install the package as usual:
+2) Copy libgsl.dll, libcblas.dll (from the binaries package gsl-1.8.bin.zip)
+   and liblapack.dll (borrowed from the R system) to the ghc folder, e.g.:
+       C:\ghc\ghc-6.x.x.
+   Rename libcblas.dll to libblas.dll.
+   They are needed to compile programs.
+   These three dlls are available from:
+       http://perception.inf.um.es/~aruiz/darcs/hmatrix/dll1.zip
+
+2.5) Remove the following functions from the export list of
+     lib/Numeric/GSL/Special/Ellint.hs:
+     ellint_Pcomp_e, ellint_Pcomp, ellint_Dcomp_e, ellint_Dcomp
+
+3) Install the package as usual:
        runhaskell Setup.lhs configure
        runhaskell Setup.lhs build
        runhaskell Setup.lhs install
 
-2.5) If configure cannot find ld please see:
+3.5) If configure cannot find ld please see:
        http://article.gmane.org/gmane.comp.lang.haskell.cafe/32025
 
-3) Copy libgsl.dll, libcblas.dll (from the binaries package gsl-1.8.bin.zip)
-   and liblapack.dll (borrowed from the R system) to the folder in which
-   hmatrix has been installed: C:\Program Files\haskell\hmatrix-x.x.x.x\ghc-6.x.x.
-   Rename libcblas.dll to libblas.dll.
-   They are needed to compile programs.
-   These three dlls are available from:
-       http://perception.inf.um.es/~aruiz/darcs/hmatrix/dll1.zip
-
 4) Copy the dlls available from:
        http://perception.inf.um.es/~aruiz/darcs/hmatrix/dll2.zip
    to the working directory or C:\windows\system
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/clapack.h b/lib/Numeric/LinearAlgebra/LAPACK/clapack.h
index cad9a4c..09101fd 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/clapack.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/clapack.h
@@ -1483,7 +1483,7 @@
         doublereal *wi, doublereal *z__, integer *ldz, doublereal *work, 
         integer *lwork, integer *info);
  
-/* Subroutine */ int dlabad_(doublereal *small, doublereal *large);
+/* Subroutine */ int dlabad_(doublereal *smalll, doublereal *large); /* !? */
  
 /* Subroutine */ int dlabrd_(integer *m, integer *n, integer *nb, doublereal *
         a, integer *lda, doublereal *d__, doublereal *e, doublereal *tauq, 
@@ -2858,7 +2858,7 @@ integer izmax1_(integer *n, doublecomplex *cx, integer *incx);
          integer *ihi, real *h__, integer *ldh, real *wr, real *wi, real *z__,
          integer *ldz, real *work, integer *lwork, integer *info);
  
-/* Subroutine */ int slabad_(real *small, real *large);
+/* Subroutine */ int slabad_(real *smalll, real *large); /* !? */
  
 /* Subroutine */ int slabrd_(integer *m, integer *n, integer *nb, real *a, 
         integer *lda, real *d__, real *e, real *tauq, real *taup, real *x,