aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/tools/find_static2
-rwxr-xr-xsrc/tools/make_ctags2
-rwxr-xr-xsrc/tools/pginclude/cpluspluscheck2
-rwxr-xr-xsrc/tools/pginclude/headerscheck6
-rwxr-xr-xsrc/tools/pgtest2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/find_static b/src/tools/find_static
index 1cc9ec3b3dc..b75930251d9 100755
--- a/src/tools/find_static
+++ b/src/tools/find_static
@@ -2,7 +2,7 @@
# src/tools/find_static
-trap "rm -f /tmp/$$" 0 1 2 3 15
+trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
# This script finds functions that are either never called, or
# should be static.
diff --git a/src/tools/make_ctags b/src/tools/make_ctags
index d8d18d1569f..912b6fafac1 100755
--- a/src/tools/make_ctags
+++ b/src/tools/make_ctags
@@ -5,7 +5,7 @@
command -v ctags >/dev/null || \
{ echo "'ctags' program not found" 1>&2; exit 1; }
-trap "rm -f /tmp/$$" 0 1 2 3 15
+trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
rm -f ./tags
IS_EXUBERANT=""
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
index bffca18890c..b393f2a2eaa 100755
--- a/src/tools/pginclude/cpluspluscheck
+++ b/src/tools/pginclude/cpluspluscheck
@@ -50,7 +50,7 @@ done
# Create temp directory.
tmp=`mktemp -d /tmp/$me.XXXXXX`
-trap 'rm -rf $tmp' 0 1 2 3 15
+trap "ret=$?; rm -rf $tmp; exit $ret" 0 1 2 3 15
exit_status=0
diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index bd45ee5e5c7..2a39856f88c 100755
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -46,7 +46,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed "s|\\\$(PG_SYSROOT)|$PG_SYSROOT|g"`
# Create temp directory.
tmp=`mktemp -d /tmp/$me.XXXXXX`
-trap 'rm -rf $tmp' 0 1 2 3 15
+trap "ret=$?; rm -rf $tmp; exit $ret" 0 1 2 3 15
exit_status=0
@@ -154,9 +154,9 @@ do
EXTRAINCLUDES="$python_includespec" ;;
src/interfaces/ecpg/*)
EXTRAINCLUDES="-I $builddir/src/interfaces/ecpg/include -I $srcdir/src/interfaces/ecpg/include" ;;
- src/backend/parser/*)
+ src/backend/parser/*)
EXTRAINCLUDES="-I $builddir/src/backend/parser/" ;;
- src/backend/utils/adt/*)
+ src/backend/utils/adt/*)
EXTRAINCLUDES="-I $builddir/src/backend/utils/adt/" ;;
*)
EXTRAINCLUDES="" ;;
diff --git a/src/tools/pgtest b/src/tools/pgtest
index 70f6a62ad02..fa665ff8172 100755
--- a/src/tools/pgtest
+++ b/src/tools/pgtest
@@ -14,7 +14,7 @@ MAKE="make"
[ ! -d src ] && echo "This must be run from the top of the PostgreSQL source tree" 1>&2 && exit 1
-trap "rm -rf /tmp/$$" 0 1 2 3 15
+trap "ret=$?; rm -rf /tmp/$$; exit $ret" 0 1 2 3 15
mkdir /tmp/$$
TMP="/tmp/$$"