@@ -24,14 +24,17 @@ cabal-dev add-source /Users/jgm/src/pandoc-citeproc
2424
2525echo Building pandoc...
2626cabal-dev install hsb2hs
27−cabal-dev install -v1 --prefix $ROOT/usr/local --libdir /usr/local/lib --datadir /usr/local/share --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
28−cabal-dev install -v1 --prefix $ROOT/usr/local --libdir /usr/local/lib --datadir /usr/local/share --flags="embed_data_files"
2927
30−# remove library files
31−rm -r $ROOT/usr/local/lib
32−chown -R $ME:staff $DIST
28+cabal-dev install --reinstall -v1 --prefix $ROOT/tmp --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
29+cabal-dev install -v1 --prefix $ROOT/tmp --flags="embed_data_files"
30+
31+mkdir -p $ROOT/usr/local/share
32+cp -r $ROOT/tmp/bin $ROOT/usr/local/
33+cp -r $ROOT/tmp/share/man $ROOT/usr/local/share/
34+rm -rf $ROOT/tmp
3335
34−gzip $ROOT/usr/local/share/man/man?/*.*
36+chown -R $ME:staff $DIST
37+# gzip $ROOT/usr/local/share/man/man?/*.*
3538# cabal gives man pages the wrong permissions
3639chmod +r $ROOT/usr/local/share/man/man?/*.*
3740
@@ -51,10 +54,11 @@ sudo $PACKAGEMAKER \
5154 --id net.johnmacfarlane.pandoc \
5255 --resources $RESOURCES \
5356 --version $VERSION \
54− --no-relocate \
5557 --scripts $SCRIPTS \
5658 --out $BASE.pkg
5759
60+ # --no-relocate
61+
5862echo Signing package...
5963
6064sudo codesign --force --sign "$CODESIGNID" $BASE.pkg