Mercurial > vim
changeset 2705:58f47e17ba15 v7.3.122
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.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 15 Feb 2011 15:28:09 +0100 |
| parents | a14db0b78c59 |
| children | 34f62bcce014 |
| files | .hgignore Makefile src/Makefile src/auto/config.mk src/version.c |
| diffstat | 5 files changed, 18 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore +++ b/.hgignore @@ -7,14 +7,15 @@ src/xxd/xxd 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
--- 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 @@ first: # 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) $@
--- 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! - -# 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". +# 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 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.