diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-16 18:05:50 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-16 18:05:50 +0100 |
commit | 286eacd3f6631e985089176fb1dff1bcf1a1d6b5 (patch) | |
tree | 83ec0d2a894f0d35985906dc1c3e04de10a3c9d4 /Makefile | |
parent | 9bbf63dbf8286fadc0cd6b3428010abb67b1b64d (diff) | |
download | vim-git-286eacd3f6631e985089176fb1dff1bcf1a1d6b5.tar.gz |
patch 7.4.1106v7.4.1106
Problem: The nsis script can't be used from the appveyor build.
Solution: Add "ifndef" to allow for variables to be set from the command
line. Remove duplicate SetCompressor command. Support using other
gettext binaries. (Ken Takata) Update build instructions to use
libintl-8.dll.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -131,6 +131,9 @@ MINOR = 4 # # MS-Windows: # - Run make on Unix to update the ".mo" files. +# - Get libintl-8.dll and libiconv-2.dll. E.g. from +# https://mlocati.github.io/gettext-iconv-windows/ . +# Put them in the top directory, "make dosrt" uses them. # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. @@ -493,7 +496,8 @@ dosrt_files: dist prepare no_title.vim cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \ fi \ done - cp libintl.dll dist/vim/$(VIMRTDIR)/ + cp libintl-8.dll dist/vim/$(VIMRTDIR)/ + cp libiconv-2.dll dist/vim/$(VIMRTDIR)/ # Used before uploading. Don't delete the AAPDIR/sign files! |