projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.197 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.197 | |
| 11 | Problem: Mac: "make install" doesn't work when prefix defined. | |
| 12 | Solution: Pass different arguments to "make installruntime". (Jjgod Jiang) | |
| 13 | Files: src/Makefile | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.196/src/Makefile Thu Jan 3 20:44:40 2008 | |
| 17 | --- src/Makefile Thu Jan 3 18:30:02 2008 | |
| 18 | *************** | |
| 19 | *** 2559,2566 **** | |
| 20 | # -mkdir $(DESTDIR)$(prefix)/$(APPDIR)/bin | |
| 21 | srcdir=`pwd`; $(MAKE) -f Makefile installruntime \ | |
| 22 | VIMEXE=$$srcdir/$(VIMTARGET) \ | |
| 23 | ! prefix=$(DESTDIR)$(prefix)/$(RESDIR)/vim \ | |
| 24 | ! VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime | |
| 25 | # Put the link back. | |
| 26 | ln -s `pwd`/../runtime $(RESDIR)/vim | |
| 27 | # Copy rgb.txt, Mac doesn't always have X11 | |
| 28 | --- 2564,2574 ---- | |
| 29 | # -mkdir $(DESTDIR)$(prefix)/$(APPDIR)/bin | |
| 30 | srcdir=`pwd`; $(MAKE) -f Makefile installruntime \ | |
| 31 | VIMEXE=$$srcdir/$(VIMTARGET) \ | |
| 32 | ! prefix=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \ | |
| 33 | ! exec_prefix=$(DESTDIR)$(prefix)/$(APPDIR)/Contents \ | |
| 34 | ! BINDIR=$(DESTDIR)$(prefix)/$(APPDIR)/Contents/MacOS \ | |
| 35 | ! VIMLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \ | |
| 36 | ! VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR)/runtime | |
| 37 | # Put the link back. | |
| 38 | ln -s `pwd`/../runtime $(RESDIR)/vim | |
| 39 | # Copy rgb.txt, Mac doesn't always have X11 | |
| 40 | *** ../vim-7.1.196/src/version.c Thu Jan 3 20:44:35 2008 | |
| 41 | --- src/version.c Fri Jan 4 11:52:46 2008 | |
| 42 | *************** | |
| 43 | *** 668,669 **** | |
| 44 | --- 668,671 ---- | |
| 45 | { /* Add new patch number below this line */ | |
| 46 | + /**/ | |
| 47 | + 197, | |
| 48 | /**/ | |
| 49 | ||
| 50 | -- | |
| 51 | CUSTOMER: Well, can you hang around a couple of minutes? He won't be | |
| 52 | long. | |
| 53 | MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today. | |
| 54 | CUSTOMER: Well, when is your next round? | |
| 55 | MORTICIAN: Thursday. | |
| 56 | DEAD PERSON: I think I'll go for a walk. | |
| 57 | The Quest for the Holy Grail (Monty Python) | |
| 58 | ||
| 59 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 60 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 61 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 62 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |