Another improvement in gencl

* mu-aux/gencl: New option --email.
* Makefile.am: Simplify the ChangeLog command.  Use the --email option.

@@ -133,18 +133,11 @@ amend_file=ChangeLog.amend
 .PHONY: ChangeLog
 .PHONY: ChangeLog
 ChangeLog: 
 ChangeLog: 
 	$(AM_V_at)if test -d .git; then					\
 	$(AM_V_at)if test -d .git; then					\
-	    cmd="$(top_srcdir)/mu-aux/gencl --verbose --append-dot";    \
-            if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \
-	    then							\
-		cmd="$$cmd --append=$(prev_change_log)";		\
-	    fi;								\
-	    if test -n "$(amend_file)"; then                            \
-              cmd="$$cmd --amend=$(amend_file)";                        \
-            fi;                                                         \
-	    if test -n "$(gen_start_date)"; then                        \
-	      cmd="$$cmd --since=$(gen_start_date)";			\
-	    fi;                                                         \
-	    $$cmd;	                                                \
+	    $(top_srcdir)/mu-aux/gencl --verbose --append-dot           \
+                    --email=$(PACKAGE_BUGREPORT)                        \
+		    --append=$(prev_change_log)     		        \
+                    --amend=$(amend_file)                               \
+	            --since=$(gen_start_date);    			\
 	fi
 	fi
 
 
 dist-hook: ChangeLog
 dist-hook: ChangeLog

@@ -25,6 +25,7 @@ my $amend_file;
 my %amendment;
 my %amendment;
 my $append_dot;
 my $append_dot;
 my $ignore_errors;
 my $ignore_errors;
+my $email;
 
 
 my $exit_status = 0;
 my $exit_status = 0;
 
 
@@ -37,10 +38,12 @@ gencl - generate ChangeLog from git log output
 B<gencl>
 B<gencl>
 [B<-fiv>]    
 [B<-fiv>]    
 [B<-a> I<FILE>]
 [B<-a> I<FILE>]
+[B<-m> I<EMAIL>]    
 [B<-F> I<FILE>]
 [B<-F> I<FILE>]
 [B<--amend=>I<FILE>]
 [B<--amend=>I<FILE>]
 [B<--append-dot>]
 [B<--append-dot>]
 [B<--append=>I<FILE>]
 [B<--append=>I<FILE>]
+[B<--email=>I<EMAIL>]    
 [B<--file=>I<FILE>]
 [B<--file=>I<FILE>]
 [B<--force>]
 [B<--force>]
 [B<--ignore-errors>]    
 [B<--ignore-errors>]    
@@ -86,7 +89,13 @@ Append I<FILE> to the end of the generated file.  Multiple B<--append>
 are processed in the order of their occurrence on the command line.
 are processed in the order of their occurrence on the command line.
 The content of I<FILE> is appended verbatim, except that the line beginning
 The content of I<FILE> is appended verbatim, except that the line beginning
 with the text B<Local Variables:> is taken to mark the end of file.
 with the text B<Local Variables:> is taken to mark the end of file.
-   
+
+=item B<-m>, B<--email=>I<EMAIL>
+
+Sets email address to use in the topmost automatically generated entry.
+In the absense of this option, B<gencl> constructs the email from the
+current user name and the domain (or host) name.    
+    
 =item B<-F>, B<--file=>I<FILE>
 =item B<-F>, B<--file=>I<FILE>
 
 
 Create I<FILE> instead of the B<ChangeLog>.
 Create I<FILE> instead of the B<ChangeLog>.
@@ -225,13 +234,40 @@ GetOptions(
     'strip-cherry-pick' => \$strip_cherry_pick,
     'strip-cherry-pick' => \$strip_cherry_pick,
     'amend=s' => \$amend_file,
     'amend=s' => \$amend_file,
     'append-dot' => \$append_dot,
     'append-dot' => \$append_dot,
-    'ignore-errors|i' => \$ignore_errors
+    'ignore-errors|i' => \$ignore_errors,
+    'email|m=s' => \$email
     ) or exit(1);
     ) or exit(1);
 
 
 if (! -d '.git') {
 if (! -d '.git') {
     exit 0;
     exit 0;
 }
 }
 
 
+unless (defined($email)) {
+    if (exists($ENV{EMAIL})) {
+	$email = $ENV{EMAIL};
+    } else {
+	my ($user, $domain);
+	if (exists($ENV{USER})) {
+	    $user = $ENV{USER};
+	} elsif (my ($name) = getpwuid(getuid())) {
+	    $user = $name;
+	} else {
+	    die "can't get user name";
+	}
+
+	if (chomp($domain = `domainname`) && $domain ne "(none)") {
+	    ;
+	} elsif (exists($ENV{HOSTNAME})) {
+	    $domain = $ENV{HOSTNAME};
+	} elsif ($domain = `hostname`) {
+	    chomp $domain;
+	} else {
+	    $domain = 'localhost';
+	}
+	$email = $user . '@' . $domain;
+    }
+}
+
 read_amend_file($amend_file) if $amend_file;
 read_amend_file($amend_file) if $amend_file;
     
     
 $Text::Wrap::columns = 72;
 $Text::Wrap::columns = 72;
@@ -258,7 +294,7 @@ sub toplevel_entry {
 
 
     my @header;
     my @header;
 
 
-    push @header, "$date  Automatically generated  <bug-mailutils\@gnu.org>";
+    push @header, "$date  Automatically generated  <$email>";
     push @header, '';
     push @header, '';
     push @header, "\tHEAD $hash.";
     push @header, "\tHEAD $hash.";
     push @header, '';
     push @header, '';
@@ -289,6 +325,9 @@ sub toplevel_entry {
 sub headcmp {
 sub headcmp {
     my $file = shift;
     my $file = shift;
     if (open(my $fd, '<', $changelog_file)) {
     if (open(my $fd, '<', $changelog_file)) {
+	# Skip first line
+	$_ = <$fd>;
+	shift;
 	while (<$fd>) {
 	while (<$fd>) {
 	    my $line = shift;
 	    my $line = shift;
 	    last unless defined($line);
 	    last unless defined($line);