aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.122

Browse Source 
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.
This commit is contained in:
Bram Moolenaar 2011-02-15 15:28:09 +01:00
parent b75d09d42b
commit 542512a3e5
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -5,14 +5,15 @@ src/xxd/xxd
src/auto/if_perl.c src/auto/if_perl.c
src/tags src/tags
# We do need src/auto/configure and src/auto/config.mk. # We do need src/auto/configure.
src/auto/osdef.h
src/auto/config.aap src/auto/config.aap
src/auto/config.cache src/auto/config.cache
src/auto/config.h src/auto/config.h
src/auto/config.log src/auto/config.log
src/auto/config.mk
src/auto/config.status src/auto/config.status
src/auto/configure.aap src/auto/configure.aap
src/auto/osdef.h
src/auto/link.log src/auto/link.log
src/auto/link.sed src/auto/link.sed
src/auto/pathdef.c src/auto/pathdef.c

6
Makefile
View File

@ -23,6 +23,9 @@
# has run can result in compiling with $(CC) empty. # has run can result in compiling with $(CC) empty.
first: 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 "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there" @echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@ cd src && $(MAKE) $@
@ -30,6 +33,9 @@ first:
# Some make programs use the last target for the $@ default; put the other # Some make programs use the last target for the $@ default; put the other
# targets separately to always let $@ expand to "first" by default. # 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: 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 "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there" @echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@ cd src && $(MAKE) $@

11
src/Makefile
View File

@ -283,12 +283,13 @@ CC=
######################## auto/config.mk ######################## {{{1 ######################## auto/config.mk ######################## {{{1
# At this position auto/config.mk is included. When starting from the # At this position auto/config.mk is included. When starting from the
# distribution it is almost empty. After running auto/configure it contains # toplevel Makefile it is almost empty. After running auto/configure it
# settings that have been discovered for your system. Settings below this # contains settings that have been discovered for your system. Settings below
# include override settings in auto/config.mk! # this include override settings in auto/config.mk!
# Note: if auto/config.mk is lost somehow (e.g., because configure was # Note: If make fails because auto/config.mk does not exist (it is not
# interrupted), create an empty auto/config.mk file and do "make config". # 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, # (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. # if the current choice doesn't work, try the other one.

5
src/auto/config.mk
View File

@ -1,5 +0,0 @@
the first targets to make vim are: scratch config myself
srcdir = .
VIMNAME = vim
EXNAME = ex
VIEWNAME = view

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
122,
/**/ /**/
121, 121,
/**/ /**/