git.iko.soy/typeable/pandoc
on master help sign in
Revert "make_osx_package.sh: don't use cpphs."
0ebd5afJohn MacFarlane
make_osx_package.sh+2−1
compare with master
unifiedsplit
@@ -12,6 +12,7 @@ SCRIPTS=$OSX/osx-resources
12BASE=pandoc-$VERSION
12BASE=pandoc-$VERSION
13ME=$(whoami)
13ME=$(whoami)
14PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
15+CPPHS=$SANDBOX/bin/cpphs
15
16
16# echo Removing old files...
17# echo Removing old files...
17rm -rf $DIST
18rm -rf $DIST
@@ -25,7 +26,7 @@ echo Building pandoc...
25cabal clean
26cabal clean
26# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
27# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
27cabal install cpphs hsb2hs
28cabal install cpphs hsb2hs
28−cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
29+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" --ghc-options "-pgmP$CPPHS -optP--cpp" . pandoc-citeproc
29
30
30make man
31make man
31# get pandoc-citeproc man page:
32# get pandoc-citeproc man page: