From 43fbd222ccdb5a5b8ac862ae89bc1abbae7094a0 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 17 Jul 2018 23:16:05 +0000
Subject: [PATCH] Check that EC2SNSTOPIC and EC2PUBLIC are non-empty, along
 with being defined, in order to avoid problems with thermite.sh.

Reported by:	gjb
---
 release/Makefile.ec2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 329b345c1f37..d392adda78b2 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -8,10 +8,10 @@
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
 AMINAMESUFFIX!=	date +-%Y-%m-%d
 .endif
-.if defined(EC2PUBLIC)
+.if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
 PUBLISH=	--public
 .endif
-.if defined(EC2SNSTOPIC)
+.if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
 EC2SNSREL=	${REVISION}-${BRANCH}
 EC2_SVNBRANCH!=	svn info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
 EC2_SVNREV!=	svn info --show-item last-changed-revision ${WORLDDIR}