Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update gitignore and Makefile for additional entries

diff --cc .gitignore
Simple merge

diff --cc Makefile.global
index 05c5d151b74cc652cd143f18d33f8b29d766bbee,ff858c2aa3072bb2fb5674c4ec2cb21f6730439e..40fadccbc83ef46b6a22da47a1f8ad1c29d015aa
--- 1/Makefile.global
--- 2/Makefile.global
+++ b/Makefile.global
@@@ -115,19 -113,11 +115,20 @@@ clean
        find . -name \*.la -o -name \*.a | xargs rm -f 
        find . -name \*.so | xargs rm -f
        find . -name .libs -a -type d|xargs rm -rf
 -      rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+       find . -name \*.1 | xargs rm -f
 +      rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
  
  distclean: clean
 -      rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
 +      rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
 +      rm -f php5.spec main/build-defs.h scripts/phpize
 +      rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h
 +      rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
 +      rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 +      rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
 +      rm -f ext/phar/phar.phar ext/phar/phar.php
 +      if test "$(srcdir)" != "$(builddir)"; then \
 +        rm -f ext/phar/phar/phar.inc; \
 +      fi
        $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
  
  .PHONY: all clean install distclean test