diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-09-16 16:15:08 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-09-16 16:15:08 -0700 |
| commit | 24ccfedf7adfdd459a7562951935ac14b0c40eb4 (patch) | |
| tree | 9eab2212f39043d349fb52793d9b0ff9ec024aa8 | |
| parent | 965806f087f2975a8211cd36c9b3702efc83731a (diff) | |
| download | pandoc-24ccfedf7adfdd459a7562951935ac14b0c40eb4.tar.gz | |
'make winpkg': Fixed creation of zips.
| -rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -61,14 +61,16 @@ macospkg: man/pandoc.1 winpkg: pandoc-$(version)-windows-i386.msi pandoc-$(version)-windows-i386.zip pandoc-$(version)-windows-x86_64.msi pandoc-$(version)-windows-x86_64.zip pandoc-$(version)-windows-%.zip: pandoc-$(version)-windows-%.msi - -rm -rf wintmp && \ - msiextract -C wintmp $< && \ - cd wintmp/"Program Files*" && \ - mv Pandoc pandoc-$(version) && \ - zip -r $@ pandoc-$(version) && \ - mv $@ ../../ && \ - cd ../.. && \ - rm -rf wintmp + ORIGDIR=`pwd` && \ + CONTAINER=$(basename $<) && \ + TEMPDIR=`mktemp -d` && \ + msiextract -C $$TEMPDIR/msi $< && \ + pushd $$TEMPDIR && \ + mkdir $$CONTAINER && \ + find msi -type f -exec cp {} $$CONTAINER/ \; && \ + zip -r $$ORIGDIR/$@ $$CONTAINER && \ + popd & \ + rm -rf $$TEMPDIR pandoc-$(version)-windows-%.msi: pandoc-windows-%.msi osslsigncode sign -pkcs12 ~/Private/ComodoCodeSigning.exp2019.p12 -in $< -i http://johnmacfarlane.net/ -t http://timestamp.comodoca.com/ -out $@ -askpass |