Merge pull request #926 from JacobBarthelmeh/dist

fixes for make distcheck
pull/930/head
John Safranek 2026-04-16 15:14:37 -07:00 committed by GitHub
commit 91cbb647d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions

View File

@ -280,7 +280,10 @@ AS_IF([test "x$ENABLED_SSHD" = "xyes"],[
])
AC_CONFIG_LINKS([keys/gretel-key-rsa.pub:keys/gretel-key-rsa.pub
keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem])
keys/gretel-key-rsa.pem:keys/gretel-key-rsa.pem
keys/server-key-rsa.der:keys/server-key-rsa.der
keys/server-key-ecc.der:keys/server-key-ecc.der
keys/server-key-ecc-521.der:keys/server-key-ecc-521.der])
# Set the automake conditionals.
AM_CONDITIONAL([BUILD_EXAMPLE_SERVERS],[test "x$ENABLED_EXAMPLES" = "xyes"])

View File

@ -8,7 +8,12 @@ then
exit 77
fi
if [ ! -x ./scripts/fwd.test.expect ]
# Automake sets $srcdir for tests. When building out-of-tree (e.g.
# make distcheck), the expect script only lives in the source tree,
# not the build tree. Fall back to the current directory otherwise.
expect_script="${srcdir:-.}/scripts/fwd.test.expect"
if [ ! -x "$expect_script" ]
then
echo "fail: missing expect script"
exit 1
@ -46,4 +51,4 @@ fi
# Run the expect script
./scripts/fwd.test.expect
"$expect_script"