|
 |
2971eef |
To: vim-dev@vim.org
|
|
|
2971eef |
Subject: Patch 7.1.197
|
|
|
2971eef |
Fcc: outbox
|
|
|
2971eef |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
2971eef |
Mime-Version: 1.0
|
|
|
2971eef |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
2971eef |
Content-Transfer-Encoding: 8bit
|
|
|
2971eef |
------------
|
|
|
2971eef |
|
|
|
2971eef |
Patch 7.1.197
|
|
|
2971eef |
Problem: Mac: "make install" doesn't work when prefix defined.
|
|
|
2971eef |
Solution: Pass different arguments to "make installruntime". (Jjgod Jiang)
|
|
|
2971eef |
Files: src/Makefile
|
|
|
2971eef |
|
|
|
2971eef |
|
|
|
2971eef |
*** ../vim-7.1.196/src/Makefile Thu Jan 3 20:44:40 2008
|
|
|
2971eef |
--- src/Makefile Thu Jan 3 18:30:02 2008
|
|
|
2971eef |
***************
|
|
|
2971eef |
*** 2559,2566 ****
|
|
|
2971eef |
# -mkdir $(DESTDIR)$(prefix)/$(APPDIR)/bin
|
|
|
2971eef |
srcdir=`pwd`; $(MAKE) -f Makefile installruntime \
|
|
|
2971eef |
VIMEXE=$$srcdir/$(VIMTARGET) \
|
|
|
2971eef |
! prefix=$(DESTDIR)$(prefix)/$(RESDIR)/vim \
|
|
|
2971eef |
! VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
|
|
|
2971eef |
# Put the link back.
|
|
|
2971eef |
ln -s `pwd`/../runtime $(RESDIR)/vim
|
|
|
2971eef |
# Copy rgb.txt, Mac doesn't always have X11
|
|
|
2971eef |
--- 2564,2574 ----
|
|
|
2971eef |
# -mkdir $(DESTDIR)$(prefix)/$(APPDIR)/bin
|
|
|
2971eef |
srcdir=`pwd`; $(MAKE) -f Makefile installruntime \
|
|
|
2971eef |
VIMEXE=$$srcdir/$(VIMTARGET) \
|
|
|
2971eef |
! prefix=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \
|
|
|
2971eef |
! exec_prefix=$(DESTDIR)$(prefix)/$(APPDIR)/Contents \
|
|
|
2971eef |
! BINDIR=$(DESTDIR)$(prefix)/$(APPDIR)/Contents/MacOS \
|
|
|
2971eef |
! VIMLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR) \
|
|
|
2971eef |
! VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)$(VIMDIR)/runtime
|
|
|
2971eef |
# Put the link back.
|
|
|
2971eef |
ln -s `pwd`/../runtime $(RESDIR)/vim
|
|
|
2971eef |
# Copy rgb.txt, Mac doesn't always have X11
|
|
|
2971eef |
*** ../vim-7.1.196/src/version.c Thu Jan 3 20:44:35 2008
|
|
|
2971eef |
--- src/version.c Fri Jan 4 11:52:46 2008
|
|
|
2971eef |
***************
|
|
|
2971eef |
*** 668,669 ****
|
|
|
2971eef |
--- 668,671 ----
|
|
|
2971eef |
{ /* Add new patch number below this line */
|
|
|
2971eef |
+ /**/
|
|
|
2971eef |
+ 197,
|
|
|
2971eef |
/**/
|
|
|
2971eef |
|
|
|
2971eef |
--
|
|
|
2971eef |
CUSTOMER: Well, can you hang around a couple of minutes? He won't be
|
|
|
2971eef |
long.
|
|
|
2971eef |
MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today.
|
|
|
2971eef |
CUSTOMER: Well, when is your next round?
|
|
|
2971eef |
MORTICIAN: Thursday.
|
|
|
2971eef |
DEAD PERSON: I think I'll go for a walk.
|
|
|
2971eef |
The Quest for the Holy Grail (Monty Python)
|
|
|
2971eef |
|
|
|
2971eef |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
2971eef |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
2971eef |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
2971eef |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|