diff options
| author | Werner Koch <wk@gnupg.org> | 2021-10-12 17:12:29 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-10-12 17:12:39 +0200 |
| commit | 10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc (patch) | |
| tree | 8dc7f346aa2c6b86e4a874847e554c99a54320b1 /Makefile.am | |
| parent | tests: New way to make use of gpgconf.ctl in tests. (diff) | |
| download | gnupg2-10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc.tar.xz gnupg2-10f52f9bf3bcc6cf29835c2f11ea91ab0d5e7cdc.zip | |
speedo: Put the keyboxd into the Windows installer
* build-aux/speedo/w32/inst.nsi: Install keyboxd.
* Makefile.am (sign-release): Sign the wixlib only if generated.
* autogen.rc: Remove meanwhile obsolete option --with-regex.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0a0c7d4de..ca5e189d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,7 @@ release: echo "/* Build finished at $$(date -uIseconds) */" ;\ echo "/*" ;\ echo " * Please run the final step interactively:" ;\ - echo " * make sign-release" ;\ + echo " * make sign-release $${WITH_MSI:+WITH_MSI=1}" ;\ echo " */" ;\ ) 2>&1 | tee "$(RELEASE_NAME).buildlog" @@ -280,8 +280,10 @@ sign-release: gpg -sbu $$mysignkey $${release_w32_name}.tar.xz ;\ echo "/* Signing the W32 installer ..." ;\ gpg -sbu $$mysignkey $${release_w32_name}.exe ;\ - echo "/* Signing the Wixlib ..." ;\ - gpg -sbu $$mysignkey $${wixlibfile} ;\ + if [ -e $${wixlibfile} ]; then \ + echo "/* Signing the Wixlib ..." ;\ + gpg -sbu $$mysignkey $${wixlibfile} ;\ + fi; \ cat $(RELEASE_NAME).swdb >swdb.snippet;\ echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\ cat $${release_w32_name}.exe.swdb >>swdb.snippet;\ |