From 9d238060e1e84dc9577bdebff304281b3c755bdc Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 31 Mar 2021 13:37:08 +0200
Subject: [PATCH] - Clean makedist.sh.

---
 doc/Changelog |  3 +++
 makedist.sh   | 34 ++++++++++++++--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index fd10160fb..b2f9c2e6c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+31 March 2021: George
+	- Clean makedist.sh.
+
 31 March 2021: Wouter
 	- Fix stack-protector change to not override other CFLAGS options.
 
diff --git a/makedist.sh b/makedist.sh
index d490f4aad..6b7e0a83d 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -362,41 +362,35 @@ if [ "$DOWIN" = "yes" ]; then
 	file3_flag="--with-rootcert-file=C:\Program Files (x86)\Unbound\icannbundle.pem"
 	version="$version"-w32
     fi
-    echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag "$file_flag" "$file2_flag" "$file3_flag""
     if test "$W64" = "no"; then
-	# Disable stack-protector for 32-bit windows builds.
-	$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
-	|| error_cleanup "Could not configure"
+		# Disable stack-protector for 32-bit windows builds.
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'
+		$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
+		|| error_cleanup "Could not configure"
     else
-        $configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag \
-	|| error_cleanup "Could not configure"
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag"
+		$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag \
+		|| error_cleanup "Could not configure"
     fi
     info "Calling make"
-	if test "$W64" = "no"; then
-		make $MINJ || error_cleanup "Could not make"
-	else
-		make $MINJ || error_cleanup "Could not make"
-	fi
+	make $MINJ || error_cleanup "Could not make"
     info "Make complete"
 
     if test "`uname`" = "Linux"; then 
     info "Make DLL"
     cd ../unbound_shared
-    echo "$configure"' --enable-debug --disable-flto '"$* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag""
     if test "$W64" = "no"; then
 	# Disable stack-protector for 32-bit windows builds.
-	$configure --enable-debug --disable-flto $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
-	|| error_cleanup "Could not configure"
+		echo "$configure"' --enable-debug --disable-flto '"$* $shared_cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'
+		$configure --enable-debug --disable-flto $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
+		|| error_cleanup "Could not configure"
     else
+		echo "$configure"' --enable-debug --disable-flto '"$* $shared_cross_flag"
         $configure --enable-debug --disable-flto $* $shared_cross_flag \
-	|| error_cleanup "Could not configure"
+		|| error_cleanup "Could not configure"
     fi
     info "Calling make for DLL"
-	if test "$W64" = "no"; then
-		make $MINJ || error_cleanup "Could not make DLL"
-	else
-		make $MINJ || error_cleanup "Could not make DLL"
-	fi
+	make $MINJ || error_cleanup "Could not make DLL"
     info "Make DLL complete"
     cd ../unbound
     fi
-- 
2.47.2