updated for version 7.3.122
Problem: Having auto/config.mk in the repository causes problems.
Solution: Remove auto/config.mk from the distribution. In the toplevel
Makefile copy it from the "dist" file.
diff --git a/.gitignore b/.gitignore
index 676cd4e..d65e8a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,14 +5,15 @@
src/auto/if_perl.c
src/tags
-# We do need src/auto/configure and src/auto/config.mk.
-src/auto/osdef.h
+# We do need src/auto/configure.
src/auto/config.aap
src/auto/config.cache
src/auto/config.h
src/auto/config.log
+src/auto/config.mk
src/auto/config.status
src/auto/configure.aap
+src/auto/osdef.h
src/auto/link.log
src/auto/link.sed
src/auto/pathdef.c
diff --git a/Makefile b/Makefile
index bf2b309..a48112e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@
# has run can result in compiling with $(CC) empty.
first:
+ @if test ! -f src/auto/config.mk; then \
+ cp src/config.mk.dist src/auto/config.mk; \
+ fi
@echo "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@
@@ -30,6 +33,9 @@
# Some make programs use the last target for the $@ default; put the other
# targets separately to always let $@ expand to "first" by default.
all install uninstall tools config configure reconfig proto depend lint tags types test testclean clean distclean:
+ @if test ! -f src/auto/config.mk; then \
+ cp src/config.mk.dist src/auto/config.mk; \
+ fi
@echo "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@
diff --git a/src/Makefile b/src/Makefile
index 8f47f45..6d0e185 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -283,12 +283,13 @@
######################## auto/config.mk ######################## {{{1
# At this position auto/config.mk is included. When starting from the
-# distribution it is almost empty. After running auto/configure it contains
-# settings that have been discovered for your system. Settings below this
-# include override settings in auto/config.mk!
+# toplevel Makefile it is almost empty. After running auto/configure it
+# contains settings that have been discovered for your system. Settings below
+# this include override settings in auto/config.mk!
-# Note: if auto/config.mk is lost somehow (e.g., because configure was
-# interrupted), create an empty auto/config.mk file and do "make config".
+# Note: If make fails because auto/config.mk does not exist (it is not
+# included in the repository), do:
+# cp config.mk.dist auto/config.mk
# (X) How to include auto/config.mk depends on the version of "make" you have,
# if the current choice doesn't work, try the other one.
diff --git a/src/auto/config.mk b/src/auto/config.mk
deleted file mode 100644
index fa7c108..0000000
--- a/src/auto/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-the first targets to make vim are: scratch config myself
-srcdir = .
-VIMNAME = vim
-EXNAME = ex
-VIEWNAME = view
diff --git a/src/version.c b/src/version.c
index 97170e6..2827368 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 122,
+/**/
121,
/**/
120,
