summaryrefslogtreecommitdiffstats
path: root/src/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-02-15 15:28:09 +0100
committerBram Moolenaar <Bram@vim.org>2011-02-15 15:28:09 +0100
commit542512a3e5582ad6630aac0f05dddcdef1558031 (patch)
tree1a8b9f35bc888ea544891d8dcac9955cce7acbf4 /src/Makefile
parentb75d09d42b4fb277071afd166c8a394a8b6e0fda (diff)
updated for version 7.3.122v7.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.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index 8f47f45d65..6d0e185317 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -283,12 +283,13 @@ CC=
######################## 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.