Commit: patch 9.1.0595: make errors out with the po Makefile

2 views
Skip to first unread message

Christian Brabandt

unread,
Jul 17, 2024, 1:45:13 PM7/17/24
to vim...@googlegroups.com
patch 9.1.0595: make errors out with the po Makefile

Commit: https://github.com/vim/vim/commit/30d54fdddf129e30345874867e0ca2bda2eaabfa
Author: RestorerZ <rest...@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 <rest...@mail2k.ru>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/po/Makefile b/src/po/Makefile
index 0f7f85dd1..f23c6d66f 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -314,7 +314,7 @@ $(LANGUAGES):
#######

# 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 @@ $(PLUGPACKAGE).pot: $(PO_PLUG_INPUTLIST)
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)/$@ $<

diff --git a/src/version.c b/src/version.c
index 986edc928..5cff0a3d6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 595,
/**/
594,
/**/
Reply all
Reply to author
Forward
0 new messages