From 118576556b95b696bf7149e4c6c811cb28c87460 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 4 Sep 2003 18:04:16 +1000
Subject: [PATCH]    - [Makefile.in regress/agent-getpeereid.sh] config.h is
 now in $BUILDDIR      not $OBJ.

---
 ChangeLog                   | 6 ++++--
 Makefile.in                 | 3 ++-
 regress/agent-getpeereid.sh | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2faf0e70..f42d5fa8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
    - [regress/reconfigure/sh] Make path to sshd fully qualified if required.
    - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have
      it).  The sparse file will take less disk space too.
-   - [regress/sftp-cmds.sh] Ensure file used for test are readable.
+   - [regress/sftp-cmds.sh] Ensure files used for test are readable.
    - [regress/stderr-after-eof.sh] Search for a usable checksum program.
    - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
      regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
@@ -25,6 +25,8 @@
      use Strictmodes no, wait longer for sshd startup.
    - [regress/Makefile] Remove BSDisms.
    - [regress/README.regress] Add a basic readme.
+   - [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR
+     not $OBJ.
 
 20030903
  - (djm) OpenBSD CVS Sync
@@ -1015,4 +1017,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2958 2003/09/04 05:39:54 dtucker Exp $
+$Id: ChangeLog,v 1.2959 2003/09/04 08:04:16 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index dfc510fae..2f8f04a10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.243 2003/09/04 03:41:06 dtucker Exp $
+# $Id: Makefile.in,v 1.244 2003/09/04 08:04:16 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -383,6 +383,7 @@ tests:	$(TARGETS)
 	$(MAKE) \
 		.OBJDIR="$${BUILDDIR}/regress" \
 		.CURDIR="`pwd`" \
+		BUILDDIR="$${BUILDDIR}" \
 		OBJ="$${BUILDDIR}/regress" \
 		PATH="$${BUILDDIR}:$${PATH}" \
 		TEST_SSH_SSH="$${TEST_SSH_SSH}" \
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index d1f48c81f..46d20dc2b 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -7,7 +7,7 @@ UNPRIV=nobody
 ASOCK=${OBJ}/agent
 SSH_AUTH_SOCK=/nonexistant
 
-if grep "#undef.*HAVE_GETPEEREID" ${OBJ}/config.h >/dev/null 2>&1
+if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1
 then
 	echo "skipped (not supported on this platform)"
 	exit 0