summaryrefslogtreecommitdiff
path: root/make_osx_package.sh
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-14 22:12:44 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-14 22:12:44 -0700
commita8b6094cec2604ae6b03b1882dc398004eaf8ee0 (patch)
treefb3f37a437ad970c1169fce96ad1f9d2f4fb6247 /make_osx_package.sh
parent4e0fe9001c0adbf1da6ab95b89ef6d94c86f9966 (diff)
make_osx_package: look in right place for cpphs.
Diffstat (limited to 'make_osx_package.sh')
-rwxr-xr-xmake_osx_package.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index f87268e71..0f8f02d48 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -13,6 +13,7 @@ ME=$(whoami)
CODESIGNID="3rd Party Mac Developer Application: John Macfarlane"
PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
EXES="pandoc pandoc-citeproc"
+CPPHS=$SANDBOX/bin/cpphs
read -s -p "sudo password: " PASSWORD
echo $PASSWORD | sudo -S echo "Password valid, continuing."
@@ -29,8 +30,8 @@ echo Building pandoc...
cabal clean
# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
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'
+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" --ghc-options "-pgmP$CPPHS -optP--cpp"
+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options "-pgmP$CPPHS -optP--cpp"
mkdir -p $DEST/bin
mkdir -p $DEST/share/man/man1