From b98799ce964df1743478dc3d0cc503f51c4b6733 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@gnupg.org>
Date: Mon, 18 Mar 2019 16:08:23 +0100
Subject: [PATCH] speedo: Fix installer build with NSIS-3

* build-aux/speedo.mk: Add charset for nsis 3.

--
NSIS-3 defaults to UTF-8 but for NSIS-2 compatibility
we still stay on CP1252 for now.
---
 build-aux/speedo.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index d0f97f3db..569940099 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1212,7 +1212,9 @@ extra_installer_options += -DWITH_GUI=1
 endif
 
 installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
-	$(MAKENSIS) -V2 \
+	(nsis3_args=$$(makensis -version | grep -q "^v3" && \
+                  echo "-INPUTCHARSET CP1252"); \
+	$(MAKENSIS) -V2 $$nsis3_args \
                     -DINST_DIR=$(idir) \
                     -DINST6_DIR=$(idir6) \
                     -DBUILD_DIR=$(bdir) \
@@ -1223,7 +1225,7 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
 		    -DNAME=$(INST_NAME) \
 	            -DVERSION=$(INST_VERSION) \
 		    -DPROD_VERSION=$(INST_PROD_VERSION) \
-		    $(extra_installer_options) $(w32src)/inst.nsi
+		    $(extra_installer_options) $(w32src)/inst.nsi)
 	@echo "Ready: $(idir)/$(INST_NAME)-$(INST_VERSION)_$(BUILD_DATESTR).exe"