From dd8d9a6cdcb8c9f4682dc99216db715c406e60a8 Mon Sep 17 00:00:00 2001
Message-Id: <dd8d9a6cdcb8c9f4682dc99216db715c406e60a8.1717825884.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 5 Jun 2013 20:54:17 +0100
Subject: [PATCH] bin/mdw-build: Fetch `distdir' more robustly.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

Some build scripts will try to build something before they can properly
answer the `print-distdir' question.  Avoid being confused by the
resulting spam by writing the distribution directory name to a weird
file descriptor.
---
 bin/mdw-build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/mdw-build b/bin/mdw-build
index bd1b457..69a6642 100755
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -285,9 +285,10 @@ esac
 cat >find-distdir.mk <<'EOF'
 include Makefile
 print-distdir:
-	@echo $(distdir)
+	@echo >&3 $(distdir)
 EOF
-assign distdir $(make -f find-distdir.mk print-distdir)
+assign distdir \
+	$({ make -f find-distdir.mk print-distdir >/dev/null 2>&1; } 3>&1)
 
 ## Get a tarball distribution.
 case "$distcheck" in
-- 
[mdw]