@@ -1,7 +1,7 @@
11#!/bin/sh -e
22
33DIST=`pwd`/osx_package
4−TMP=`pwd`/cabaltmp
4+SANDBOX=`pwd`/.cabal-sandbox
55VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
66RESOURCES=$DIST/Resources
77ROOT=$DIST/pandoc
@@ -22,18 +22,17 @@ cabal update
2222
2323echo Building pandoc...
2424cabal sandbox init
25−cabal install -v1 --prefix $TMP --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
26−cabal install -v1 --prefix $TMP --flags="embed_data_files"
25+cabal install -v1 --reinstall --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
26+cabal install -v1 --reinstall --flags="embed_data_files"
2727
2828mkdir -p $ROOT/usr/local/bin
2929mkdir -p $ROOT/usr/local/share/man/man1
3030mkdir -p $ROOT/usr/local/share/man/man5
3131for f in $EXES; do
32− cp $TMP/bin/$f $ROOT/usr/local/bin/;
33− cp $TMP/share/man/man1/$f.1 $ROOT/usr/local/share/man/man1/
32+ cp $SANDBOX/bin/$f $ROOT/usr/local/bin/;
33+ cp $SANDBOX/share/man/man1/$f.1 $ROOT/usr/local/share/man/man1/
3434done
35−cp $TMP/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
36−# rm -rf $TMP
35+cp $SANDBOX/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
3736
3837chown -R $ME:staff $DIST
3938# gzip $ROOT/usr/local/share/man/man?/*.*
@@ -41,7 +40,7 @@ chown -R $ME:staff $DIST
4140chmod +r $ROOT/usr/local/share/man/man?/*.*
4241
4342echo Copying license...
44−$TMP/bin/pandoc --data data -t rtf -s COPYING -o $RESOURCES/License.rtf
43+$SANDBOX/bin/pandoc --data data -t rtf -s COPYING -o $RESOURCES/License.rtf
4544
4645echo Signing pandoc executable...
4746