@@ -7,6 +7,7 @@ VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
77RESOURCES=$DIST/Resources
88ROOT=$DIST/pandoc
99DEST=$ROOT/usr/local
10+PANDOC=$DEST/bin/pandoc
1011SCRIPTS=$MACOS/macos-resources
1112BASE=pandoc-$VERSION
1213ME=$(whoami)
@@ -20,12 +21,14 @@ export MACMACOS_DEPLOYMENT_TARGET=10.7
2021rm -rf $DIST
2122mkdir -p $DIST
2223mkdir -p $RESOURCES
24+mkdir -p $DEST/bin
25+mkdir -p $DEST/share/man/man1
26+
2327stack setup
24−which cpphs || stack install cpphs
2528
2629echo Building pandoc...
2730stack clean
28−stack install --stack-yaml=stack.pkg.yaml --local-bin-path . pandoc pandoc-citeproc
31+stack install --stack-yaml=stack.pkg.yaml --local-bin-path $DEST/bin/ pandoc pandoc-citeproc
2932
3033echo Getting man pages...
3134make man/pandoc.1
@@ -36,18 +39,13 @@ PANDOC_CITEPROC_TARBALL=https://hackage.haskell.org/package/pandoc-citeproc-${PA
3639curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $DIST
3740PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
3841
39−mkdir -p $DEST/bin
40−mkdir -p $DEST/share/man/man1
41−for f in pandoc pandoc-citeproc; do
42− cp $MACOS/$f $DEST/bin/;
43−done
4442cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
4543cp man/pandoc.1 $DEST/share/man/man1/
4644
4745chown -R $ME:staff $DIST
4846
4947echo Copying license...
50−$MACOS/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html
48+$PANDOC --data data -t html5 -s COPYING.md -Vpagetitle="License" -o $RESOURCES/license.html
5149
5250# Removing executable signing because of a problem that arose in El Capitan
5351# "source=obsolete resource envelope"
@@ -62,11 +60,11 @@ echo Creating MacOS package...
6260
6361sed -e "s/PANDOCVERSION/$VERSION/" $MACOS/distribution.xml.in > $MACOS/distribution.xml
6462
65−pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
63+pkgbuild --root $ROOT --identifier net.johnmacfarlane.pandoc --version $VERSION --ownership recommended $DIST/pandoc.pkg
6664productbuild --distribution $MACOS/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-MacOS.pkg
6765
6866# verify signature
6967spctl --assess --type install $BASE-MacOS.pkg
7068
7169# cleanup
72−rm -r $DIST $MACOS/pandoc $MACOS/pandoc-citeproc
70+rm -r $DIST