summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Fitch <willf@aweber.com>2014-01-23 21:28:45 -0500
committerWill Fitch <willf@aweber.com>2014-01-23 21:28:45 -0500
commitc4c10a222e4358b1d9d28ef852e8a5d56709865d (patch)
treea5575fc632cb59dc7731ed34b700a03b75c0181b
parent0eff7176defea46d2453a109542480a4263621cb (diff)
downloadphp-git-c4c10a222e4358b1d9d28ef852e8a5d56709865d.tar.gz
Update gitignore and Makefile for additional entries
-rw-r--r--.gitignore4
-rw-r--r--Makefile.global1
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6f291dc917..32d6ae03f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,6 +204,8 @@ ext/pdo_sqlite/sqlite3.h
ext/pdo_sqlite/tests/*.db
ext/pdo_sqlite/tests/*.tmp
ext/phar/phar.phar
+ext/phar/phar.1
+ext/phar/phar.phar.1
ext/pspell/tests/*.tmp
ext/reflection/xml
ext/reflection/html
@@ -235,12 +237,14 @@ sapi/apache/libphp5.module
sapi/apache2handler/libphp5.module
sapi/apache_hooks/libphp5.module
sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
sapi/cli/php.1
sapi/fpm/php-fpm
sapi/fpm/php-fpm.1
sapi/fpm/init.d.php-fpm
sapi/fpm/php-fpm.conf
sapi/fpm/fpm/php-cgi
+sapi/phpdbg/phpdbg
scripts/php-config
scripts/phpize
scripts/man1/*.1
diff --git a/Makefile.global b/Makefile.global
index 6b79ad7aa4..ff858c2aa3 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -113,6 +113,7 @@ 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
+ find . -name \*.1 | xargs rm -f
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
distclean: clean