summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-01-18 21:37:03 -0800
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-01-18 21:37:03 -0800
commit5720dc0ba9c40ec8b89ccd6ecbb53ad004ee0e69 (patch)
tree7b523c575a65af5b0ede34d510462d2802a2f75f
parent9596b7d82ff8f98c2b9ccf9802b20c970637cc1a (diff)
Updated Makefile to use Hackage pandoc-types.
-rw-r--r--Makefile16
1 files changed, 7 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 421dd24f0..7371c2c13 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,9 @@ all:
prof:
cabal-dev configure --enable-tests --enable-library-profiling --enable-executable-profiling && cabal-dev build
-prep: pandoc-types submodules
+prep: submodules
(cabal-dev --version || (cabal update && cabal install cabal-dev)) && \
cabal-dev update && \
- (cd pandoc-types && git pull && cd .. && cabal-dev add-source pandoc-types) && \
- cabal-dev install --reinstall --force-reinstall pandoc-types citeproc-hs && \
cabal-dev install-deps --enable-library-profiling --enable-tests --enable-benchmarks
submodules:
@@ -34,13 +32,13 @@ clean:
veryclean: clean
cabal-dev clean && rm -rf pandoc-types citeproc-hs
-pandoc-types:
- git clone https://github.com/jgm/pandoc-types && \
- cabal-dev add-source pandoc-types
+# pandoc-types:
+# git clone https://github.com/jgm/pandoc-types && \
+# cabal-dev add-source pandoc-types
-citeproc-hs: pandoc-types
- darcs get --lazy http://gorgias.mine.nu/repos/citeproc-hs && \
- cabal-dev add-source citeproc-hs
+# citeproc-hs: pandoc-types
+# darcs get --lazy http://gorgias.mine.nu/repos/citeproc-hs && \
+# cabal-dev add-source citeproc-hs
install:
cabal-dev install --enable-tests --enable-benchmarks