diff -ruN postgresql-7.4.6-old/src/backend/catalog/genbki.sh postgresql-7.4.6/src/backend/catalog/genbki.sh
--- postgresql-7.4.6-old/src/backend/catalog/genbki.sh	2003-07-29 16:12:50.000000000 +0200
+++ postgresql-7.4.6/src/backend/catalog/genbki.sh	2005-01-24 21:53:09.563245616 +0100
@@ -108,12 +108,7 @@
     exit 1
 fi
 
-if [ x"$TMPDIR" = x"" ] ; then
-    TMPDIR=/tmp
-fi
-
-
-TMPFILE="$TMPDIR/genbkitmp$$.c"
+TMPFILE=$(tempfile --prefix=genbki --suffix=.c) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
 
 trap "rm -f $TMPFILE ${OUTPUT_PREFIX}.bki.$$ ${OUTPUT_PREFIX}.description.$$" 0 1 2 3 15
 
diff -ruN postgresql-7.4.6-old/src/test/bench/perquery postgresql-7.4.6/src/test/bench/perquery
--- postgresql-7.4.6-old/src/test/bench/perquery	1996-07-09 08:22:21.000000000 +0200
+++ postgresql-7.4.6/src/test/bench/perquery	2005-01-24 21:55:49.009006176 +0100
@@ -1,12 +1,11 @@
 #!/bin/sh
 
-egrep 'x = "|elapse' > /tmp/foo$$
-
+egrep 'x = "|elapse' | \
 awk 'BEGIN { x = 0; y = 0; z = 0; a = 0; } \
      /.*elapse.*/ {x = $2 + x; y = $4 + y; z = $6 + z;} \
      /.*x = ".*/ { \
 	 printf "query %2d: %7.3f real %7.3f user %7.3f sys\n", a, x, y, z; \
 	 x = 0; y = 0; z = 0; a = a + 1; } \
-     END {printf("query %2d: %7.3f real %7.3f user %7.3f sys\n", a, x, y, z);}' \
-	 < /tmp/foo$$
+     END {printf("query %2d: %7.3f real %7.3f user %7.3f sys\n", a, x, y, z);}' 
+