aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2019-03-18 15:08:23 +0000
committerWerner Koch <[email protected]>2019-11-25 19:09:48 +0000
commitf29a9ed9d0a01e6447d8ff8ad3df464a006d1c80 (patch)
treec5acc1660705aa065d212fec8659b44af1ad29f7
parenttests: Adjust for now invalid SHA-1 key signatures. (diff)
downloadgnupg-f29a9ed9d0a01e6447d8ff8ad3df464a006d1c80.tar.gz
gnupg-f29a9ed9d0a01e6447d8ff8ad3df464a006d1c80.zip
speedo: Tell makensis the used charset of the script.
-- Adapted from the version in master.
-rw-r--r--build-aux/speedo.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index d1f980037..fcb7b2785 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1259,7 +1259,8 @@ installer: all w32_insthelpers $(w32src)/inst-options.ini $(bdir)/README.txt
done; \
fi \
)
- $(MAKENSIS) -V2 \
+ $(MAKENSIS) -V2 $$($(MAKENSIS) -version \
+ | grep -q ^v3 && echo "-INPUTCHARSET CP1252 ") \
-DINST_DIR=$(idir) \
-DINST6_DIR=$(idir6) \
-DBUILD_DIR=$(bdir) \