|
 |
eed495c |
To: vim-dev@vim.org
|
|
|
eed495c |
Subject: Patch 7.2.399 (extra)
|
|
|
eed495c |
Fcc: outbox
|
|
|
eed495c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
eed495c |
Mime-Version: 1.0
|
|
|
eed495c |
Content-Type: text/plain; charset=UTF-8
|
|
|
eed495c |
Content-Transfer-Encoding: 8bit
|
|
|
eed495c |
------------
|
|
|
eed495c |
|
|
|
eed495c |
Patch 7.2.399 (extra, after 7.2.388)
|
|
|
eed495c |
Problem: Cannot compile on MingW.
|
|
|
eed495c |
Solution: Move ifneq to separate line. (Vlad Sandrini, Dominique Pelle)
|
|
|
eed495c |
Files: src/Make_ming.mak
|
|
|
eed495c |
|
|
|
eed495c |
|
|
|
eed495c |
*** ../vim-7.2.398/src/Make_ming.mak 2010-03-10 13:19:28.000000000 +0100
|
|
|
eed495c |
--- src/Make_ming.mak 2010-03-17 17:23:31.000000000 +0100
|
|
|
eed495c |
***************
|
|
|
eed495c |
*** 215,226 ****
|
|
|
eed495c |
ifndef RUBY_PLATFORM
|
|
|
eed495c |
ifeq ($(RUBY_VER), 16)
|
|
|
eed495c |
RUBY_PLATFORM = i586-mswin32
|
|
|
eed495c |
! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
|
|
|
eed495c |
RUBY_PLATFORM = i386-mingw32
|
|
|
eed495c |
else
|
|
|
eed495c |
RUBY_PLATFORM = i386-mswin32
|
|
|
eed495c |
endif
|
|
|
eed495c |
endif
|
|
|
eed495c |
|
|
|
eed495c |
ifndef RUBY_INSTALL_NAME
|
|
|
eed495c |
ifeq ($(RUBY_VER), 16)
|
|
|
eed495c |
--- 215,228 ----
|
|
|
eed495c |
ifndef RUBY_PLATFORM
|
|
|
eed495c |
ifeq ($(RUBY_VER), 16)
|
|
|
eed495c |
RUBY_PLATFORM = i586-mswin32
|
|
|
eed495c |
! else
|
|
|
eed495c |
! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
|
|
|
eed495c |
RUBY_PLATFORM = i386-mingw32
|
|
|
eed495c |
else
|
|
|
eed495c |
RUBY_PLATFORM = i386-mswin32
|
|
|
eed495c |
endif
|
|
|
eed495c |
endif
|
|
|
eed495c |
+ endif
|
|
|
eed495c |
|
|
|
eed495c |
ifndef RUBY_INSTALL_NAME
|
|
|
eed495c |
ifeq ($(RUBY_VER), 16)
|
|
|
eed495c |
*** ../vim-7.2.398/src/version.c 2010-03-17 16:54:51.000000000 +0100
|
|
|
eed495c |
--- src/version.c 2010-03-17 17:23:40.000000000 +0100
|
|
|
eed495c |
***************
|
|
|
eed495c |
*** 683,684 ****
|
|
|
eed495c |
--- 683,686 ----
|
|
|
eed495c |
{ /* Add new patch number below this line */
|
|
|
eed495c |
+ /**/
|
|
|
eed495c |
+ 399,
|
|
|
eed495c |
/**/
|
|
|
eed495c |
|
|
|
eed495c |
--
|
|
|
eed495c |
Life is a gift, living is an art. (Bram Moolenaar)
|
|
|
eed495c |
|
|
|
eed495c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
eed495c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
eed495c |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
eed495c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|