diff options
| -rw-r--r-- | .github/workflows/release-candidate.yml | 6 | ||||
| -rw-r--r-- | macos/Makefile | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index c536e5a74..3b4b829ac 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -112,11 +112,7 @@ jobs: mkdir -p ${DEST}/bin mkdir -p ${DEST}/share/man/man1 cp ~/.local/bin/pandoc ${DEST}/bin/ - SRCDIR=$(pwd) - cd ${DEST}/bin - strip pandoc - ln -s pandoc pandoc-server - cd ${SRCDIR} + strip ${DEST}/bin/pandoc cp man/pandoc.1 ${DEST}/share/man/man1/pandoc.1 cp man/pandoc-server.1 ${DEST}/share/man/man1/pandoc-server.1 ~/.local/bin/pandoc -s COPYING.md -Vpagetitle=License -o ${RESOURCES}/license.html diff --git a/macos/Makefile b/macos/Makefile index 25fa7cc6d..a0210b643 100644 --- a/macos/Makefile +++ b/macos/Makefile @@ -10,13 +10,16 @@ signed.txt: $(DEST) codesign --force --options runtime -s "5U2WKE6DES" $(DEST)/bin/pandoc echo "SIGNED" > signed.txt -pandoc.pkg: signed.txt +$(DEST)/bin/pandoc-server: + cd $(DEST)/bin && ln -s pandoc pandoc-server + +pandoc.pkg: $(DEST)/bin/pandoc-server signed.txt pkgbuild --root pandoc --identifier net.johnmacfarlane.pandoc --version $(VERSION) --ownership recommended $@ $(BASE)-macOS.pkg: pandoc.pkg productbuild --distribution distribution.xml --resources Resources --package-path $< --version $(VERSION) --sign 'Developer ID Installer: John Macfarlane' $@ -$(BASE)-macOS.zip: signed.txt +$(BASE)-macOS.zip: $(DEST)/bin/pandoc-server signed.txt ln -s $(DEST) $(BASE) zip -r $@ $(BASE) |