summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-11 16:21:33 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-11 16:21:33 +0200
commit679beba8007b804be210ef118bd23a38cb803ef6 (patch)
tree2ba82f32dd5cfd0d525f87e2bf4166abe1fc6740
parent29a9baa0779c21f3d055a7b119d6d5650f4ae56e (diff)
downloadvim-git-679beba8007b804be210ef118bd23a38cb803ef6.tar.gz
patch 8.1.1151: build fails when using shadow directoryv8.1.1151
Problem: Build fails when using shadow directory. Solution: Link the desktop.in files.
-rw-r--r--src/Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 35471ae9b..116f49426 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2778,7 +2778,7 @@ shadow: runtime pixmaps
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
$(MKDIR_P) $(SHADOWDIR)/po
- cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/Makefile .
+ cd $(SHADOWDIR)/po; ln -s ../../po/*.po ../../po/*.mak ../../po/*.vim ../../po/*.in ../../po/Makefile .
cd $(SHADOWDIR); rm -f auto/link.sed
cp Makefile configure $(SHADOWDIR)
rm -f $(SHADOWDIR)/auto/config.mk $(SHADOWDIR)/config.mk.dist
diff --git a/src/version.c b/src/version.c
index efd117ea8..e75a60b43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1151,
+/**/
1150,
/**/
1149,