lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
0e94c5a
To: vim_dev@googlegroups.com
0e94c5a
Subject: Patch 7.4.273
0e94c5a
Fcc: outbox
0e94c5a
From: Bram Moolenaar <Bram@moolenaar.net>
0e94c5a
Mime-Version: 1.0
0e94c5a
Content-Type: text/plain; charset=UTF-8
0e94c5a
Content-Transfer-Encoding: 8bit
0e94c5a
------------
0e94c5a
0e94c5a
Patch 7.4.273
0e94c5a
Problem:    "make autoconf" and "make reconfig" may first run configure and
0e94c5a
	    then remove the output.
0e94c5a
Solution:   Add these targets to the exceptions. (Ken Takata)
0e94c5a
Files:	    src/Makefile
0e94c5a
0e94c5a
0e94c5a
*** ../vim-7.4.272/src/Makefile	2014-04-29 12:15:22.852032651 +0200
0e94c5a
--- src/Makefile	2014-04-29 19:58:23.611545773 +0200
0e94c5a
***************
0e94c5a
*** 1670,1676 ****
0e94c5a
  	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
0e94c5a
  		rm auto/config.cache; \
0e94c5a
  	fi
0e94c5a
! 	if test "X$(MAKECMDGOALS)" != "Xclean" -a "X$(MAKECMDGOALS)" != "Xdistclean"; then \
0e94c5a
  	    GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
0e94c5a
  		CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
0e94c5a
  		LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
0e94c5a
--- 1670,1679 ----
0e94c5a
  	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
0e94c5a
  		rm auto/config.cache; \
0e94c5a
  	fi
0e94c5a
! 	if test "X$(MAKECMDGOALS)" != "Xclean" \
0e94c5a
! 		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
0e94c5a
! 		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
0e94c5a
! 		-a "X$(MAKECMDGOALS)" != "Xreconfig"; then \
0e94c5a
  	    GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
0e94c5a
  		CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
0e94c5a
  		LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
0e94c5a
*** ../vim-7.4.272/src/version.c	2014-04-29 17:41:18.351689927 +0200
0e94c5a
--- src/version.c	2014-04-29 19:59:21.895544751 +0200
0e94c5a
***************
0e94c5a
*** 736,737 ****
0e94c5a
--- 736,739 ----
0e94c5a
  {   /* Add new patch number below this line */
0e94c5a
+ /**/
0e94c5a
+     273,
0e94c5a
  /**/
0e94c5a
0e94c5a
-- 
0e94c5a
From "know your smileys":
0e94c5a
 <|-) Chinese
0e94c5a
 <|-( Chinese and doesn't like these kind of jokes
0e94c5a
0e94c5a
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
0e94c5a
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
0e94c5a
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
0e94c5a
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///