Updated makefile

Makefile

@@ -1,31 +1,22 @@
 NAME=syfco
+BLDTOOL=`if [ -d "dist" ]; then echo "cabal"; else echo "stack"; fi`
 
 default:
-	@cabal update
-	@cabal configure
-	@cabal build exe:${NAME}
-	@cp ./dist/build/${NAME}/${NAME} ${NAME}
-	@strip ${NAME}
+	${BLDTOOL} build
+	@if [ -d "dist" ]; then cp ./dist/build/${NAME}/${NAME} ${NAME}; else cp `stack path | grep local-install-root | sed 's/local-install-root: //'`/bin/${NAME} ${NAME}; fi
 
 ghci:
-	@cabal update
-	@cabal configure
-	@cabal build
-	@cabal repl
+	${BLDTOOL} repl
 
 install:
-	@cabal update
-	@cabal configure
-	@cabal build exe:${NAME}
-	@cabal install
-
+	${BLDTOOL} install
 
 haddock:
-	@cabal --executable --hyperlink-source haddock
+	${BLDTOOL} haddock
 
 clean:
+	${BLDTOOL} clean
 	@rm -fR ${NAME}
-	@rm -fR dist
 
 .PHONY: clean
 .SILENT:

README

@@ -1,5 +1,5 @@
 # Synthesis Format Conversion Tool
-# (Version 1.0.0.23)
+# (Version 1.0.0.24)
 
 A tool for reading, manipulating and transforming synthesis
 specifications in TLSF [0].
@@ -47,7 +47,7 @@ The main features of the tool are summarized as follows:
 
 SyfCo is written in Haskell and can be compiled using the
 Glasgow Haskell Compiler (GHC). To install the tool you can either
-use cabal [9] or stack [10](recommended).
+use cabal [9] or stack [10] (recommended).
 For more information about the purpose of these tools and why you
 should prefer using stack instead of cabal, we recommend reading
 this blog post [11] by Mathieu Boespflug. 

README.md

@@ -1,4 +1,4 @@
-# Synthesis Format Conversion Tool<br/>(Version 1.0.0.23)
+# Synthesis Format Conversion Tool<br/>(Version 1.0.0.24)
 
 A tool for reading, manipulating and transforming synthesis
 specifications in [TLSF](https://arxiv.org/abs/1604.02284).
@@ -45,7 +45,7 @@ The main features of the tool are summarized as follows:
 
 SyfCo is written in Haskell and can be compiled using the
 Glasgow Haskell Compiler (GHC). To install the tool you can either
-use [cabal](https://www.haskell.org/cabal) or [stack](https://docs.haskellstack.org/en/stable/README/)(recommended).
+use [cabal](https://www.haskell.org/cabal) or [stack](https://docs.haskellstack.org/en/stable/README/) (recommended).
 For more information about the purpose of these tools and why you
 should prefer using stack instead of cabal, we recommend reading
 [this blog post](https://www.fpcomplete.com/blog/2015/06/why-is-stack-not-cabal) by Mathieu Boespflug. 

src/Info.hs

@@ -578,7 +578,7 @@ readme m = appendlinks $ unlines
   , "Glasgow Haskell Compiler (GHC). To install the tool you can either"
   , "use " ++ link "cabal" "https://www.haskell.org/cabal" ++ " or " ++
     link "stack" "https://docs.haskellstack.org/en/stable/README/" ++
-    "(recommended)."
+    " (recommended)."
   , "For more information about the purpose of these tools and why you"
   , "should prefer using stack instead of cabal, we recommend reading"
   ,  link "this blog post"

syfco.cabal

@@ -1,5 +1,5 @@
 name:                syfco
-version:             1.0.0.23
+version:             1.0.0.24
 synopsis:            Synthesis Format Conversion Tool / Library
 description:         Library and tool for reading, manipulating and transforming synthesis specifications.
 license:             MIT