From 82cab3f8554f5e0789282a960deba91ae8f8574e Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 15 Jan 2008 15:47:16 +0000 Subject: [PATCH] makedist fixup. git-svn-id: file:///svn/unbound/trunk@865 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 1 + makedist.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index 84d4945f6..e014db2f6 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,7 @@ - removed debug prints. - porting experience, define for Solaris, test refined for BSD compatibility. The feature probably will not work on OpenBSD. + - makedist fixup for ldns-src in build-dir. 14 January 2008: Wouter - in no debug sets NDEBUG to remove asserts. diff --git a/makedist.sh b/makedist.sh index 15eb19b5f..7878f28cd 100755 --- a/makedist.sh +++ b/makedist.sh @@ -146,7 +146,9 @@ if test -z "$LDNSDIR"; then # try to autodetect from Makefile (if present) if test -f Makefile; then eval `grep 'ldnsdir=' Makefile` - LDNSDIR="$ldnsdir" + if echo "$ldnsdir" | grep -v ldns-src/ >/dev/null 2>&1; then + LDNSDIR="$ldnsdir" + fi fi fi -- 2.47.2