git.iko.soy/typeable/pandoc
on master help sign in
Don't use unicode_collation in building OSX package.
8708e2bJohn MacFarlane
make_osx_package.sh+2−4
compare with master
unifiedsplit
@@ -7,7 +7,6 @@ RESOURCES=$DIST/Resources
7ROOT=$DIST/pandoc
7ROOT=$DIST/pandoc
8SCRIPTS=osx-resources
8SCRIPTS=osx-resources
9BASE=pandoc-$VERSION
9BASE=pandoc-$VERSION
10−ICU=/usr/local/Cellar/icu4c/51.1
11ME=jgm
10ME=jgm
12CODESIGNID="Developer ID Application: John Macfarlane"
11CODESIGNID="Developer ID Application: John Macfarlane"
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
12PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
@@ -22,8 +21,8 @@ cabal update
22
21
23echo Building pandoc...
22echo Building pandoc...
24cabal sandbox init
23cabal sandbox init
25−cabal install -v1 --reinstall --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
24+cabal install --reinstall --flags="embed_data_files" pandoc-citeproc
26−cabal install -v1 --reinstall --flags="embed_data_files"
25+cabal install --reinstall --flags="embed_data_files"
27
26
28mkdir -p $ROOT/usr/local/bin
27mkdir -p $ROOT/usr/local/bin
29mkdir -p $ROOT/usr/local/share/man/man1
28mkdir -p $ROOT/usr/local/share/man/man1
@@ -34,7 +33,6 @@ for f in $EXES; do
34 cp $SANDBOX/share/man/man1/$f.1 $ROOT/usr/local/share/man/man1/
33 cp $SANDBOX/share/man/man1/$f.1 $ROOT/usr/local/share/man/man1/
35done
34done
36cp $SANDBOX/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
35cp $SANDBOX/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
37−cp -av /usr/local/opt/icu4c/lib/*.dylib $ROOT/usr/local/opt/icu4c/lib/
38
36
39chown -R $ME:staff $DIST
37chown -R $ME:staff $DIST
40# gzip $ROOT/usr/local/share/man/man?/*.*
38# gzip $ROOT/usr/local/share/man/man?/*.*