To: vim-dev@vim.org
Subject: Patch 6.1.318
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.318
Problem:    auto/pathdef.c can include wrong quotes when a compiler flag
	    includes quotes.
Solution:   Put a backslash before the quotes in compiler flags. (Shinra Aida)
Files:	    src/Makefile


*** ../vim61.317/src/Makefile	Fri Oct 11 15:35:32 2002
--- src/Makefile	Mon Feb  3 21:42:21 2003
***************
*** 1955,1970 ****
  auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
  	CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
  
  auto/pathdef.c: Makefile auto/config.mk
  	-@echo creating $@
  	-@echo '/* pathdef.c */' > $@
  	-@echo '/* This file is automatically created by Makefile' >> $@
  	-@echo ' * DO NOT EDIT!  Change Makefile only. */' >> $@
  	-@echo '#include "vim.h"' >> $@
! 	-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> $@
! 	-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> $@
! 	-@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' >>  $@
! 	-@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' >>  $@
  	-@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
  	-@if test -n "$(COMPILEDBY)"; then \
  		echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
--- 1961,1977 ----
  auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
  	CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
  
+ QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
  auto/pathdef.c: Makefile auto/config.mk
  	-@echo creating $@
  	-@echo '/* pathdef.c */' > $@
  	-@echo '/* This file is automatically created by Makefile' >> $@
  	-@echo ' * DO NOT EDIT!  Change Makefile only. */' >> $@
  	-@echo '#include "vim.h"' >> $@
! 	-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
! 	-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@
! 	-@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >>  $@
! 	-@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >>  $@
  	-@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
  	-@if test -n "$(COMPILEDBY)"; then \
  		echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
*** ../vim61.317/src/version.c	Sun Feb  2 21:43:36 2003
--- src/version.c	Mon Feb  3 21:46:18 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     318,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
107. When using your phone you forget that you don't have to use your
     keyboard.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///