From afa585bf7d5ee333ff672db7c9145c259a18f8ab Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 10 Jul 2008 16:49:26 +0000
Subject: [PATCH] Fix "etc source" output when not using a tarball

ok "bien sur!" sthen@
---
 usr.sbin/sysmerge/sysmerge.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 72bc1259051..db2b18a5f32 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $OpenBSD: sysmerge.sh,v 1.17 2008/07/08 11:04:28 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.18 2008/07/10 16:49:26 ajacoutot Exp $
 #
 # This script is based on the FreeBSD mergemaster script, written by
 # Douglas Barton <DougB@FreeBSD.org>
@@ -59,8 +59,10 @@ do_pre() {
 		if [ -n "${TGZURL}" ]; then
 			echo " etc source:   ${TGZURL}"
 			echo "               (fetched in ${TGZ})"
-		else
-			[ -n "${TGZ}" ] && echo " etc source:   ${TGZ}"
+		elif [ -n "${TGZ}" ]; then
+			echo " etc source:   ${TGZ}"
+		elif [ -n "${SRCDIR}" ]; then
+			echo " etc source:   ${SRCDIR}"
 		fi
 		if [ -n "${XTGZURL}" ]; then
 			echo " xetc source:  ${XTGZURL}"
-- 
2.20.1