@@ -61,14 +61,16 @@ macospkg: man/pandoc.1
6161winpkg: pandoc-$(version)-windows-i386.msi pandoc-$(version)-windows-i386.zip pandoc-$(version)-windows-x86_64.msi pandoc-$(version)-windows-x86_64.zip
6262
6363pandoc-$(version)-windows-%.zip: pandoc-$(version)-windows-%.msi
64− -rm -rf wintmp && \
65− msiextract -C wintmp $< && \
66− cd wintmp/"Program Files*" && \
67− mv Pandoc pandoc-$(version) && \
68− zip -r $@ pandoc-$(version) && \
69− mv $@ ../../ && \
70− cd ../.. && \
71− rm -rf wintmp
64+ ORIGDIR=`pwd` && \
65+ CONTAINER=$(basename $<) && \
66+ TEMPDIR=`mktemp -d` && \
67+ msiextract -C $$TEMPDIR/msi $< && \
68+ pushd $$TEMPDIR && \
69+ mkdir $$CONTAINER && \
70+ find msi -type f -exec cp {} $$CONTAINER/ \; && \
71+ zip -r $$ORIGDIR/$@ $$CONTAINER && \
72+ popd & \
73+ rm -rf $$TEMPDIR
7274
7375pandoc-$(version)-windows-%.msi: pandoc-windows-%.msi
7476 osslsigncode sign -pkcs12 ~/Private/ComodoCodeSigning.exp2019.p12 -in $< -i http://johnmacfarlane.net/ -t http://timestamp.comodoca.com/ -out $@ -askpass