projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d1b4bd6a ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.399 (extra) | |
| 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.2.399 (extra, after 7.2.388) | |
| 11 | Problem: Cannot compile on MingW. | |
| 12 | Solution: Move ifneq to separate line. (Vlad Sandrini, Dominique Pelle) | |
| 13 | Files: src/Make_ming.mak | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.398/src/Make_ming.mak 2010-03-10 13:19:28.000000000 +0100 | |
| 17 | --- src/Make_ming.mak 2010-03-17 17:23:31.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 215,226 **** | |
| 20 | ifndef RUBY_PLATFORM | |
| 21 | ifeq ($(RUBY_VER), 16) | |
| 22 | RUBY_PLATFORM = i586-mswin32 | |
| 23 | ! else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X) | |
| 24 | RUBY_PLATFORM = i386-mingw32 | |
| 25 | else | |
| 26 | RUBY_PLATFORM = i386-mswin32 | |
| 27 | endif | |
| 28 | endif | |
| 29 | ||
| 30 | ifndef RUBY_INSTALL_NAME | |
| 31 | ifeq ($(RUBY_VER), 16) | |
| 32 | --- 215,228 ---- | |
| 33 | ifndef RUBY_PLATFORM | |
| 34 | ifeq ($(RUBY_VER), 16) | |
| 35 | RUBY_PLATFORM = i586-mswin32 | |
| 36 | ! else | |
| 37 | ! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),) | |
| 38 | RUBY_PLATFORM = i386-mingw32 | |
| 39 | else | |
| 40 | RUBY_PLATFORM = i386-mswin32 | |
| 41 | endif | |
| 42 | endif | |
| 43 | + endif | |
| 44 | ||
| 45 | ifndef RUBY_INSTALL_NAME | |
| 46 | ifeq ($(RUBY_VER), 16) | |
| 47 | *** ../vim-7.2.398/src/version.c 2010-03-17 16:54:51.000000000 +0100 | |
| 48 | --- src/version.c 2010-03-17 17:23:40.000000000 +0100 | |
| 49 | *************** | |
| 50 | *** 683,684 **** | |
| 51 | --- 683,686 ---- | |
| 52 | { /* Add new patch number below this line */ | |
| 53 | + /**/ | |
| 54 | + 399, | |
| 55 | /**/ | |
| 56 | ||
| 57 | -- | |
| 58 | Life is a gift, living is an art. (Bram Moolenaar) | |
| 59 | ||
| 60 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 61 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 62 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 63 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |