Mercurial > vim

changeset 35725:6dbc6f88e464 v9.1.0595

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0595: make errors out with the po Makefile Commit: https://github.com/vim/vim/commit/30d54fdddf129e30345874867e0ca2bda2eaabfa Author: RestorerZ <restorer@mail2k.ru> Date: Wed Jul 17 19:28:25 2024 +0200 patch 9.1.0595: make errors out with the po Makefile Problem: make errors out with the po Makefile (yanivshlom, after v9.1.0558) Solution: Set variables differently (RestorerZ) fixes: #15275 closes: #15282 Signed-off-by: RestorerZ <restorer@mail2k.ru> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Wed, 17 Jul 2024 19:45:07 +0200
parents ae96617e7bcf
children c8dc21856831
files src/po/Makefile src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -314,7 +314,7 @@ update-po: $(MOFILES:.mo=)
 #######
 
 # Preparing the POT file of the plug-in package
-POT_PLUGPACKAGE_PATH != pwd
+POT_PLUGPACKAGE_PATH = $(PWD)
 $(PLUGPACKAGE).pot: $(PO_PLUG_INPUTLIST)
 	$(VIMPROG) -u NONE --not-a-term -S tojavascript.vim \
 		$(PLUGPACKAGE).pot $?
@@ -327,7 +327,7 @@ POT_PLUGPACKAGE_PATH != pwd
 	rm -f *.js ./vim_to_js
 
 # Converting the PO file of the plug-in package to the binary format of the MO
-MO_PLUGPACKAGE_PATH != pwd
+MO_PLUGPACKAGE_PATH = $(PWD)
 $(PLUGPACKAGE).mo: $(PO_PLUGPACKAGE)
 	$(MSGFMTCMD) -o $(MO_PLUGPACKAGE_PATH)/$@ $<
 
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    595,
+/**/
     594,
 /**/
     593,