diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | make_osx_package.sh | 4 |
2 files changed, 4 insertions, 5 deletions
@@ -3,7 +3,7 @@ makemanpages=$(shell find dist -type f -name make-pandoc-man-pages) ifeq "${makemanpages}" "" makemanpages=@echo "You need to 'cabal configure -fmake-pandoc-man-pages && cabal build'" && exit 1 endif -setup=$(shell find dist -type f -name setup) +setup=dist/setup/setup MANPAGES=man/man1/pandoc.1 man/man5/pandoc_markdown.5 CABALARGS=-fmake-pandoc-man-pages --enable-tests --enable-benchmarks @@ -28,11 +28,10 @@ install: haddock: cabal haddock -sdist: man haddock +sdist: man # note: cabal sdist doesn't work well with preprocessors for some cabal versions ${setup} sdist -# sanity check on sdist dist: sdist rm -rf "pandoc-${version}" tar xvzf dist/pandoc-${version}.tar.gz diff --git a/make_osx_package.sh b/make_osx_package.sh index c1e1f4ac1..ac6427af1 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -60,10 +60,10 @@ echo Creating OSX package... rm -rf $BASE.pkg pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg -productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version 1.13 --sign "Developer ID Installer: John Macfarlane" $BASE.pkg +productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version 1.13 --sign "Developer ID Installer: John Macfarlane" $BASE-osx.pkg # verify signature -spctl --assess --type install $BASE.pkg +spctl --assess --type install $BASE-osx.pkg # cleanup rm -r $DIST |