minor changes

2 files changed, 15 insertions, 20 deletions

diff --git a/packages/Makefile b/packages/Makefile
index e9d8586..547cf51 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,22 +1,17 @@
-pkgs=base gsl special glpk tests ../../hTensor ../../easyVision/packages/base
+pkgs=base gsl special glpk tests ../../hTensor ../../easyVision/packages/tools ../../easyVision/packages/base
+
+cabalcmd =                         \
+      for p in $(1); do            \
+          if [ -e $$p ]; then          \
+            cd $$p; cabal $(2) ; cd -; \
+          fi;                          \
+        done                           \
+        cd sparse;                     \
+        cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) $(2); cd -;
 
 all:
-        for p in $(pkgs); do \
-          if [ -e $$p ]; then \
-            cd $$p; cabal install --force-reinstall --enable-documentation ; cd -; \
-          fi; \
-        done
-        cd sparse; \
-        cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \
-                  --force-reinstall --enable-documentation ; cd -;
+        $(call cabalcmd, $(pkgs), install --force-reinstall --enable-documentation)
 
 fast:
-        for p in $(pkgs); do \
-          if [ -e $$p ]; then \
-            cd $$p; cabal install --force-reinstall ; cd -; \
-          fi; \
-        done
-        cd sparse; \
-        cabal install --extra-include-dirs=$(MKL) --extra-lib-dirs=$(MKL) \
-                  --force-reinstall; cd -;
+        $(call cabalcmd, $(pkgs), install --force-reinstall)
 
diff --git a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
index a25f4cb..cf0f581 100644
--- a/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
+++ b/packages/tests/src/Numeric/LinearAlgebra/Tests.hs
@@ -216,7 +216,7 @@ normsMTest = TestList [
  ] where v = (2><2) [1,-2*iC,3:+4,7] :: Matrix (Complex Double)
          x = (2><2) [1,2,-3,5] :: Matrix Double
          a =~= b = fromList [a] :~10~: fromList [b]
-         a =~~= b = fromList [a] :~5~: fromList [b]
+--       a =~~= b = fromList [a] :~5~: fromList [b]
 
 ---------------------------------------------------------------------
 
@@ -592,8 +592,8 @@ runTests n = do
 
 
 -- single precision approximate equality
-infixl 4 |~~|
-a |~~| b = a :~6~: b
+-- infixl 4 |~~|
+-- a |~~| b = a :~6~: b
 
 makeUnitary v | realPart n > 1    = v / scalar n
               | otherwise = v