colder Fri, 09 Jul 2010 12:06:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301123
Log:
Allow conflicts
Changed paths:
U php/php-src/branches/LEMON/Makefile.frag
Modified: php/php-src/branches/LEMON/Makefile.frag
===================================================================
--- php/php-src/branches/LEMON/Makefile.frag 2010-07-09 12:02:41 UTC (rev
301122)
+++ php/php-src/branches/LEMON/Makefile.frag 2010-07-09 12:06:45 UTC (rev
301123)
@@ -11,7 +11,7 @@
$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
- @$(LEMON) -q -c $(srcdir)/zend_language_parser.y
+ @$(LEMON) -q -c $(srcdir)/zend_language_parser.y || test $? -eq 25
$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
