summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2011-08-27 01:52:35 +0000
committerBruce Momjian2011-08-27 01:52:35 +0000
commit68c019a5383bae89794b8a37001a7b8801e9a19b (patch)
treea00d24128a75e585790d35e8a529ab232a941fdf
parente7088713cd2bb6ce2ce630d07feb45b011308932 (diff)
Add another pgdefine path check, and a cvs-git change.
-rwxr-xr-xsrc/tools/make_mkid2
-rwxr-xr-xsrc/tools/pginclude/pgcompinclude5
-rwxr-xr-xsrc/tools/pginclude/pgrminclude2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/make_mkid b/src/tools/make_mkid
index 0c3414073b..6f160614cd 100755
--- a/src/tools/make_mkid
+++ b/src/tools/make_mkid
@@ -5,7 +5,7 @@
mkid `find \`pwd\`/ \( -name _deadcode -a -prune \) -o \
-type f -name '*.[chyl]' -print|sed 's;//;/;g'`
-find . -name 'CVS' -prune -o -type d -print |while read DIR
+find . \( -name .git -a -prune \) -o -type d -print |while read DIR
do
[ "$DIR" != "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/ID $DIR/ID
done
diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude
index e2505e685a..fdbf58e16a 100755
--- a/src/tools/pginclude/pgcompinclude
+++ b/src/tools/pginclude/pgcompinclude
@@ -3,6 +3,11 @@
# takes -v option to display compile failure message and line numbers
# src/tools/pginclude/pgcompinclude
+if ! pgdefine
+then echo "pgdefine must be in your PATH" 1>&2
+ exit 1
+fi
+
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15
find . \( -name .git -a -prune \) -o -name '*.h' -type f -print | while read FILE
do
diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude
index aef57060c0..64d7ef7199 100755
--- a/src/tools/pginclude/pgrminclude
+++ b/src/tools/pginclude/pgrminclude
@@ -6,8 +6,6 @@ then echo "pgdefine must be in your PATH" 1>&2
exit 1
fi
-# src/tools/pginclude/pgrminclude
-
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
# do include files first
(find . \( -name .git -a -prune \) -o -type f -name '*.h' -print;