Index: configure
--- configure.orig	2006-08-05 20:54:49 +0200
+++ configure	2006-08-24 12:00:28 +0200
@@ -16231,6 +16231,7 @@
 
 
 
+LIBOBJS="$LIBOBJS regex.$ac_objext"
 
 
   { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
Index: locate/updatedb.sh
--- locate/updatedb.sh.orig	2006-06-14 23:19:51 +0200
+++ locate/updatedb.sh	2006-08-24 12:00:05 +0200
@@ -137,6 +137,7 @@
 : ${LOCATE_DB=@LOCATE_DB@}
 
 # Directory to hold intermediate files.
+if [ ".$TMPDIR" = . ]; then
 if test -d /var/tmp; then
   : ${TMPDIR=/var/tmp}
 elif test -d /usr/tmp; then
@@ -144,7 +145,7 @@
 else
   : ${TMPDIR=/tmp}
 fi
-export TMPDIR
+fi
 
 # The user to search network directories as.
 : ${NETUSER=daemon}