vim/patches/vim-7.3.122.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.122
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.122
  11 Problem:    Having auto/config.mk in the repository causes problems.
  12 Solution:   Remove auto/config.mk from the distribution.  In the toplevel
  13             Makefile copy it from the "dist" file.
  14 Files:      Makefile, src/Makefile, src/auto/config.mk
  15
  16
  17 *** ../vim-7.3.121/Makefile     2010-08-15 21:57:20.000000000 +0200
  18 --- Makefile    2011-02-12 14:28:09.000000000 +0100
  19 ***************
  20 *** 23,28 ****
  21 --- 23,31 ----
  22   # has run can result in compiling with $(CC) empty.
  23
  24   first:
  25 +       @if test ! -f src/auto/config.mk; then \
  26 +               cp src/config.mk.dist src/auto/config.mk; \
  27 +       fi
  28         @echo "Starting make in the src directory."
  29         @echo "If there are problems, cd to the src directory and run make there"
  30         cd src && $(MAKE) $@
  31 ***************
  32 *** 30,35 ****
  33 --- 33,41 ----
  34   # Some make programs use the last target for the $@ default; put the other
  35   # targets separately to always let $@ expand to "first" by default.
  36   all install uninstall tools config configure reconfig proto depend lint tags types test testclean clean distclean:
  37 +       @if test ! -f src/auto/config.mk; then \
  38 +               cp src/config.mk.dist src/auto/config.mk; \
  39 +       fi
  40         @echo "Starting make in the src directory."
  41         @echo "If there are problems, cd to the src directory and run make there"
  42         cd src && $(MAKE) $@
  43 *** ../vim-7.3.121/src/Makefile 2010-11-03 22:32:18.000000000 +0100
  44 --- src/Makefile        2011-02-15 15:21:37.000000000 +0100
  45 ***************
  46 *** 283,294 ****
  47
  48   ######################## auto/config.mk ######################## {{{1
  49   # At this position auto/config.mk is included. When starting from the
  50 ! # distribution it is almost empty. After running auto/configure it contains
  51 ! # settings that have been discovered for your system. Settings below this
  52 ! # include override settings in auto/config.mk!
  53 !
  54 ! # Note: if auto/config.mk is lost somehow (e.g., because configure was
  55 ! # interrupted), create an empty auto/config.mk file and do "make config".
  56
  57   # (X) How to include auto/config.mk depends on the version of "make" you have,
  58   #     if the current choice doesn't work, try the other one.
  59 --- 283,295 ----
  60
  61   ######################## auto/config.mk ######################## {{{1
  62   # At this position auto/config.mk is included. When starting from the
  63 ! # toplevel Makefile it is almost empty. After running auto/configure it
  64 ! # contains settings that have been discovered for your system. Settings below
  65 ! # this include override settings in auto/config.mk!
  66 !
  67 ! # Note: If make fails because auto/config.mk does not exist (it is not
  68 ! # included in the repository), do:
  69 ! #    cp config.mk.dist auto/config.mk
  70
  71   # (X) How to include auto/config.mk depends on the version of "make" you have,
  72   #     if the current choice doesn't work, try the other one.
  73 *** ../vim-7.3.121/src/auto/config.mk   2010-08-16 21:59:00.000000000 +0200
  74 --- src/auto/config.mk  1970-01-01 01:00:00.000000000 +0100
  75 ***************
  76 *** 1,5 ****
  77 - the first targets to make vim are: scratch config myself
  78 - srcdir = .
  79 - VIMNAME = vim
  80 - EXNAME = ex
  81 - VIEWNAME = view
  82 --- 0 ----
  83 *** ../vim-7.3.121/src/version.c        2011-02-15 14:24:42.000000000 +0100
  84 --- src/version.c       2011-02-15 15:25:07.000000000 +0100
  85 ***************
  86 *** 716,717 ****
  87 --- 716,719 ----
  88   {   /* Add new patch number below this line */
  89 + /**/
  90 +     122,
  91   /**/
  92
  93 --
  94 hundred-and-one symptoms of being an internet addict:
  95 267. You get an extra phone line so you can get phone calls.
  96
  97  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  98 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  99 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 100  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///