summaryrefslogtreecommitdiff
path: root/make_osx_package.sh
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-09-02 10:41:52 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-09-02 10:41:52 -0700
commite97b54b1231f839a3ffebce97d4447d90d9638a5 (patch)
tree616ff608265ce6f0089bfee38ff87ad992b4f14c /make_osx_package.sh
parentb4c449ed5d97d707df5b1f2806e39511871365a5 (diff)
Fixed make_osx_package.sh.
Diffstat (limited to 'make_osx_package.sh')
-rwxr-xr-xmake_osx_package.sh18
1 files changed, 11 insertions, 7 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 6f600ccc6..fe497ff4d 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -24,14 +24,17 @@ cabal-dev add-source /Users/jgm/src/pandoc-citeproc
echo Building pandoc...
cabal-dev install hsb2hs
-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
-cabal-dev install -v1 --prefix $ROOT/usr/local --libdir /usr/local/lib --datadir /usr/local/share --flags="embed_data_files"
-# remove library files
-rm -r $ROOT/usr/local/lib
-chown -R $ME:staff $DIST
+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
+cabal-dev install -v1 --prefix $ROOT/tmp --flags="embed_data_files"
+
+mkdir -p $ROOT/usr/local/share
+cp -r $ROOT/tmp/bin $ROOT/usr/local/
+cp -r $ROOT/tmp/share/man $ROOT/usr/local/share/
+rm -rf $ROOT/tmp
-gzip $ROOT/usr/local/share/man/man?/*.*
+chown -R $ME:staff $DIST
+# gzip $ROOT/usr/local/share/man/man?/*.*
# cabal gives man pages the wrong permissions
chmod +r $ROOT/usr/local/share/man/man?/*.*
@@ -51,10 +54,11 @@ sudo $PACKAGEMAKER \
--id net.johnmacfarlane.pandoc \
--resources $RESOURCES \
--version $VERSION \
- --no-relocate \
--scripts $SCRIPTS \
--out $BASE.pkg
+ # --no-relocate
+
echo Signing package...
sudo codesign --force --sign "$CODESIGNID" $BASE.pkg