- [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR

     not $OBJ.

diff --git a/ChangeLog b/ChangeLog
index 92bceaf5d881b81fb7862420526b411f85949220..7a38d26a0d2af05f4957e5d3d021cfa990d29274 100644 (file)
--- 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

diff --git a/Makefile.in b/Makefile.in
index 52d3088233da53c2aa6222c3a5f990f19be5c653..ba0a02043375d11768acdcfbfaf9a141358ca409 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 d1f48c81f7a718eac1f042b5dad3deda873b5916..46d20dc2b5879d45f111255ee399e61823651e53 100644 (file)
--- 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