Remove redundancy: strip away hard coded release versions from scripts

Adapt Makefile accordingly

Reviewed-by: Matt Caswell <[email protected]>
(Merged from openssl#120)

Author: levitte

Makefile

@@ -88,7 +88,7 @@ manpages: $(foreach S,$(NEWMANSERIES),manpages-$(S)) \
 	  $(foreach S,$(OLDMANSERIES),manpages-$(S) manmap-$(S))
 
 mancross:
-	./bin/mk-mancross
+	./bin/mk-mancross master $(SERIES)
 
 
 ## $(SIMPLE) -- SIMPLE GENERATED FILES
@@ -98,7 +98,7 @@ newsflash.inc: news/newsflash.inc
 	head -7 $? >$@
 sitemap sitemap.txt:
 	@rm -f sitemap.txt
-	./bin/mk-sitemap > sitemap.txt
+	./bin/mk-sitemap master $(SERIES) > sitemap.txt
 
 community/committers.inc:
 	@rm -f $@

bin/mk-mancross

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-releases="master 1.1.1 1.1.0 1.0.2"
+releases="$*"
 
 log () {
     echo >&2 "$@"

bin/mk-manpages

@@ -12,17 +12,10 @@ use Pod::Simple::XHTML;
 
 __PACKAGE__->run(@ARGV);
 
-sub Releases    { return (qw(master 1.1.1 1.1.0 1.0.2)) }
 sub Dirs        { return (qw(apps crypto ssl
                              man1 man3 man5 man7)) }
 sub Dir2Section { return ( apps => "man1", crypto => "man3", ssl => "man3" ) }
 
-sub getRelease {
-    my ( $class, $ver ) = @_;
-    my %known = map { $_ => 1 } $class->Releases;
-    return @_ != 2 ? %known : defined $known{$ver} ? $ver : undef;
-}
-
 sub run {
     my ( $class, @argv ) = @_;
     my $opt = $class->process_options(@argv);
@@ -298,11 +291,6 @@ sub process_options {
     push( @err, "No documentation directories in $docdir" )
         unless ( @found_dirs );
 
-    # verify release
-    push( @err, "Unknown release '$opt{RelVer}'" )
-      unless ( $class->getRelease( $opt{RelVer} ) );
-    $class->die(@err) if @err;
-
     return \%opt;
 }
 

bin/mk-sitemap

@@ -1,6 +1,8 @@
 #! /usr/bin/perl -w
 use strict;
 
+my @series = @ARGV;
+
 sub
 dodir()
 {
@@ -33,7 +35,7 @@ dodir()
 	$simple =~ s@.*/@@;
 	print "\n", "\t" x $level, $simple, "/\n";
 	next if $entry =~ m/secadv/;
-        next if $entry =~ m/man1.0.2|man1.1.0|manmaster/;
+	next if grep { $entry eq "man$_" } @series;
 	&dodir($entry, $level + 1);
     }
 }