Merge credits fixes

diff --git a/ext/overload/CREDITS b/ext/overload/CREDITS
index 1746d5369ec9aea11a8791bf475e69008416fcfe..31845154a6a99ae05579c74b63c64acafbf42f4f 100644 (file)
--- a/ext/overload/CREDITS
+++ b/ext/overload/CREDITS
@@ -1,2 +1,2 @@
 User-space object overloading
-Andrei Zmievski <andrei@php.net>
+Andrei Zmievski

diff --git a/ext/w32api/CREDITS b/ext/w32api/CREDITS
index e046aad54ce23fe7ddc8a4cc010d36fe67aa8786..8d55cfc6b24b5d23537e48ea006cbc436f880bd7 100644 (file)
--- a/ext/w32api/CREDITS
+++ b/ext/w32api/CREDITS
@@ -1,2 +1,2 @@
 W32API
-James Moore <jmoore@php.net>
+James Moore

diff --git a/scripts/credits b/scripts/credits
index 2bc8eae67ebfec09fcfbb3e1454922a1d1db6545..658580cdd761a66e56ca6d7470e36e53b6417354 100755 (executable)
--- a/scripts/credits
+++ b/scripts/credits
@@ -20,5 +20,7 @@ do
 */
 
 END
-  awk "$awkprog" $what/*/CREDITS | sort -f  >> $file
+  # Do not process skeleton #
+  files=`find "$what" -name CREDITS | grep -v "$what"/skeleton/CREDITS`
+  awk "$awkprog" $files | sort -f  >> $file
 done