From 899be59da5fbc3372444bd0fbe74af48313bed33 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 29 Sep 2021 17:14:33 +1000
Subject: Get BUILDDIR from autoconf.

Use this to replace `pwd`s in regress test command line.
---
 Makefile.in | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index b0293841..c04f25c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,7 @@ piddir=@piddir@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
 
 DESTDIR=
 VPATH=@srcdir@
@@ -30,6 +31,7 @@ PRIVSEP_PATH=@PRIVSEP_PATH@
 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 STRIP_OPT=@STRIP_OPT@
 TEST_SHELL=@TEST_SHELL@
+BUILDDIR=@abs_top_builddir@
 
 PATHS= -DSSHDIR=\"$(sysconfdir)\" \
 	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -710,38 +712,36 @@ tests:	file-tests t-exec interop-tests unit
 	echo all tests passed
 
 unit: regress-unit-binaries
-	BUILDDIR=`pwd`; \
 	cd $(srcdir)/regress || exit $$?; \
 	$(MAKE) \
-		.OBJDIR="$${BUILDDIR}/regress" \
+		.OBJDIR="$(BUILDDIR)/regress" \
 		.CURDIR="`pwd`" \
-		OBJ="$${BUILDDIR}/regress" \
+		OBJ="$(BUILDDIR)/regress" \
 		$@ && echo $@ tests passed
 
 interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
-	BUILDDIR=`pwd`; \
 	cd $(srcdir)/regress || exit $$?; \
 	EGREP='@EGREP@' \
 	$(MAKE) \
-		.OBJDIR="$${BUILDDIR}/regress" \
+		.OBJDIR="$(BUILDDIR)/regress" \
 		.CURDIR="`pwd`" \
-		BUILDDIR="$${BUILDDIR}" \
-		OBJ="$${BUILDDIR}/regress/" \
-		PATH="$${BUILDDIR}:$${PATH}" \
+		BUILDDIR="$(BUILDDIR)" \
+		OBJ="$(BUILDDIR)/regress/" \
+		PATH="$(BUILDDIR):$${PATH}" \
 		TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
 		TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
-		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_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_MODULI_FILE="$(abs_top_srcdir)/moduli" \
 		TEST_SSH_PLINK="plink" \
 		TEST_SSH_PUTTYGEN="puttygen" \
-- 
cgit v1.2.3