Put the values from env vars back.

This merges the values from the recently removed environment into make's
command line arguments since we actually need those.

diff --git a/Makefile.in b/Makefile.in
index 4f514c8db5e1e1b12ef72c01f315e312063bf5e8..304d96cd0cd267c0f66c565be782b6e2d3bbac8a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -680,24 +680,24 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
                PATH="$${BUILDDIR}:$${PATH}" \
                TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
-               TEST_SSH_SCP="$${TEST_SSH_SCP}" \
-               TEST_SSH_SSH="$${TEST_SSH_SSH}" \
-               TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
-               TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
-               TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \
-               TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
-               TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
-               TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
-               TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
-               TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \
-               TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \
-               TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
-               TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
-               TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
-               TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
-               TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
-               TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \
-               TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+               TEST_SSH_SCP="$${BUILDDIR}/scp" \
+               TEST_SSH_SSH="$${BUILDDIR}/ssh" \
+               TEST_SSH_SSHD="$${BUILDDIR}/sshd" \
+               TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \
+               TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \
+               TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \
+               TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
+               TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \
+               TEST_SSH_SFTP="$${BUILDDIR}/sftp" \
+               TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
+               TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \
+               TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \
+               TEST_SSH_PLINK="plink" \
+               TEST_SSH_PUTTYGEN="puttygen" \
+               TEST_SSH_CONCH="conch" \
+               TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
+               TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
+               TEST_SSH_ECC="@TEST_SSH_ECC@" \
                TEST_SHELL="${TEST_SHELL}" \
                EXEEXT="$(EXEEXT)" \
                $@ && echo all $@ passed