]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
nsis: create self-contained nsi file
authorNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Wed, 10 Jan 2024 19:51:37 +0000 (20:51 +0100)
committerNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Thu, 11 Jan 2024 00:07:37 +0000 (01:07 +0100)
Including from a relative path is interpreted differently
depending on where the caller is started. This allows running
nsis on the output nsi even if not located at the build directory.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Makefile.am

index af007fa2e58bf130e0d913986dcbcc028419629f..4ce076e0260eeec8f44095424b2e9118bbcea51f 100644 (file)
@@ -473,7 +473,7 @@ openconnect.nsi: version.c
          echo "VIAddVersionKey ProductVersion \"$$VERSION\""; \
          echo "VIAddVersionKey Comments \"OpenConnect multi-protocol VPN client for Windows (command-line version, built with $$TLS_LIBRARY). For more information, visit https://www.infradead.org/openconnect/\""; \
          echo "OutFile \"$$INSTALLER_NAME\""; \
-         echo "!include $(srcdir)/openconnect.nsi.in" ) > $@
+         cat "$(srcdir)/openconnect.nsi.in" ) > $@
 
 AM_V_MAKENSIS = $(am__v_MAKENSIS_$(V))
 am__v_MAKENSIS_ = $(am__v_MAKENSIS_$(AM_DEFAULT_VERBOSITY))