summaryrefslogtreecommitdiff
path: root/make_osx_package.sh
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-07-01 12:41:25 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-07-01 12:41:25 -0700
commit958a615b759aaa45333bac7f12a2a35b2d8c8b34 (patch)
tree497c7fd9ea67761ec5d06294f7d7e8b90381cab0 /make_osx_package.sh
parentb1f835976dc724252fe197c00fee4fbe53f3a604 (diff)
Don't use MANDIR in make_deb and make_osx_package.
Diffstat (limited to 'make_osx_package.sh')
-rwxr-xr-xmake_osx_package.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 27ab632de..da069565f 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -5,7 +5,6 @@ SANDBOX=`pwd`/.cabal-sandbox
VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
RESOURCES=$DIST/Resources
ROOT=$DIST/pandoc
-MANDIR=`pwd`/man
DEST=$ROOT/usr/local
OSX=osx
SCRIPTS=$OSX/osx-resources
@@ -28,7 +27,7 @@ cabal clean
cabal install cpphs hsb2hs
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
-make -B $MANDIR/man1/pandoc.1
+make -B man/man1/pandoc.1
# get pandoc-citeproc man page:
PANDOC_CITEPROC_PATH=`cabal unpack -d $DIST pandoc-citeproc | awk '{print $3;}'`
@@ -39,7 +38,7 @@ for f in pandoc pandoc-citeproc; do
cp $SANDBOX/bin/$f $DEST/bin/;
done
cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
-cp $MANDIR/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
+cp man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
chown -R $ME:staff $DIST