summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-14 00:23:27 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-14 00:23:27 -0700
commit8c1e0543d7b62d8d7a3322fdc1e283bcfa458552 (patch)
tree881f091778acc922e729c73635d4a9e864c56079
parentea71c9872d6bd81928a766fdb8bd71bd30a5c705 (diff)
windows, osx package scripts: don't need alex, happy.
-rwxr-xr-xmake_osx_package.sh2
-rw-r--r--windows/make-windows-installer.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 3e4317140..a3fb34f5d 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -28,7 +28,7 @@ cabal sandbox init
echo Building pandoc...
cabal clean
# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
-cabal install cpphs alex happy hsb2hs
+cabal install cpphs hsb2hs
cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" --ghc-options '-pgmPcpphs -optP--cpp'
cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options '-pgmPcpphs -optP--cpp'
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 0bd05a0e3..d4816fa69 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -3,7 +3,7 @@ cd ..
cabal update
cabal sandbox init
cabal clean
-cabal install hsb2hs alex happy
+cabal install hsb2hs
if %errorlevel% neq 0 exit /b %errorlevel%
cabal install -v1 --force --reinstall --flags="embed_data_files" . pandoc-citeproc
if %errorlevel% neq 0 exit /b %errorlevel%