git.iko.soy/typeable/pandoc
on master help sign in
Improved osx build procedure.
commitee88f5662bac212c416cde9b4f530d9a43f3b47c authorJohn MacFarlane <jgm@berkeley.edu> dateSun 17 Aug 2014, 23:24 (12 years ago) parentd5c41bd
1 file changed+2−4
make_osx_package.sh+2−4
make_osx_package.sh+2−4
@@ -12,7 +12,6 @@ SCRIPTS=$OSX/osx-resources
1212BASE=pandoc-$VERSION
1313ME=$(whoami)
1414PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
15−EXES="pandoc pandoc-citeproc"
1615CPPHS=$SANDBOX/bin/cpphs
1716
1817# echo Removing old files...
@@ -27,8 +26,7 @@ echo Building pandoc...
2726cabal clean
2827# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
2928cabal install cpphs hsb2hs
30−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"
31−cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options "-pgmP$CPPHS -optP--cpp"
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
3230
3331make man
3432# get pandoc-citeproc man page:
@@ -38,7 +36,7 @@ cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $MANDIR/man1/
3836mkdir -p $DEST/bin
3937mkdir -p $DEST/share/man/man1
4038mkdir -p $DEST/share/man/man5
41−for f in $EXES; do
39+for f in pandoc pandoc-citeproc; do
4240 cp $SANDBOX/bin/$f $DEST/bin/;
4341 cp $MANDIR/man1/$f.1 $DEST/share/man/man1/
4442done