bootstrap: Sort the various hash keys used in generating preinstall.am.

Something must have changed in perl to change the way the keys are
ordered by default.
This commit is contained in:
Chris Johns
2014-08-29 11:39:29 +10:00
parent b597c0d60c
commit 93d0ddd41b

View File

@@ -217,7 +217,7 @@ $output .= "\$(srcdir)/preinstall.am: Makefile.am\n";
$output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n"; $output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n";
$output .= "endif\n\n"; $output .= "endif\n\n";
foreach my $k ( keys %seen ) foreach my $k ( sort keys %seen )
{ {
if ( $k =~ /PREINSTALL_FILES/o ) { if ( $k =~ /PREINSTALL_FILES/o ) {
$output .= "all-am: \$(PREINSTALL_FILES)\n\n"; $output .= "all-am: \$(PREINSTALL_FILES)\n\n";
@@ -258,7 +258,7 @@ exit 0;
sub replace($) sub replace($)
{ {
my ($v) = @_; my ($v) = @_;
foreach my $i ( keys %dirmap ) foreach my $i ( sort keys %dirmap )
{ {
$v =~ s/\Q$i/$dirmap{$i}/g; $v =~ s/\Q$i/$dirmap{$i}/g;
} }