From 20c74efeeb701e4966e96e2176a573119c30053a Mon Sep 17 00:00:00 2001
From: rmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>
Date: Sun, 27 Jan 2013 21:38:33 +0000
Subject: Let cf_email.U honor the external MAILDOMAIN environment variable, if
 set.

git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@161 2592e710-e01b-42a5-8df0-11608a6cc53d
---
 mcon/U/cf_email.U | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'mcon/U')

diff --git a/mcon/U/cf_email.U b/mcon/U/cf_email.U
index caad32e..65c8329 100644
--- a/mcon/U/cf_email.U
+++ b/mcon/U/cf_email.U
@@ -19,7 +19,8 @@
 ?S:	Electronic mail address of the person who ran Configure. This can be
 ?S:	used by units that require the user's e-mail, like MailList.U.
 ?S:.
-?T:cont
+?T:cont maildomain
+?LINT:extern MAILDOMAIN
 : determine the e-mail address of the user who is running us
 $cat <<EOM
 
@@ -32,9 +33,13 @@ your organization...
 EOM
 cont=x
 while test "$cont"; do
+	case "$MAILDOMAIN" in
+	'') maildomain="$myhostname$mydomain";;
+	*)  maildomain="$MAILDOMAIN";;
+	esac
 	case "$cf_email" in
-	'') dflt="$cf_by@$myhostname$mydomain";;
-	*) dflt="$cf_email";;
+	'') dflt="$cf_by@$maildomain";;
+	*)  dflt="$cf_email";;
 	esac
 	rp='What is your e-mail address?'
 	. ./myread
-- 
cgit v1.2.3