From 987214b4d5118a6adf51945d6e266bb464cdd3ec Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 26 Aug 2011 16:10:34 -0400
Subject: [PATCH] do include files first

---
 src/tools/pginclude/pgrminclude | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude
index 0f0e10b899..26f5f89b19 100755
--- a/src/tools/pginclude/pgrminclude
+++ b/src/tools/pginclude/pgrminclude
@@ -1,10 +1,14 @@
 :
 # remove extra #include's
 
+pgdefine || (echo "pgdefine must be in your PATH" 1>&2; exit 1)
+
 # src/tools/pginclude/pgrminclude
 
 trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
+# do include files first
+(find . \( -name .git -a -prune \) -o -type f -name '*.h' -print;
+ find . \( -name .git -a -prune \) -o -type f -name '*.c' -print ) |
 grep -v '\./postgres.h' |
 grep -v '\./postgres_fe.h' |
 grep -v '\./pg_config.h' |