From a619e178bb25dc4868d3e688675b6b3c12a9d350 Mon Sep 17 00:00:00 2001 From: Matthias Paulmier Date: Tue, 19 Jun 2018 16:01:20 +0200 Subject: Move $gen_copyright We move the variable to the bottom of the file where it is used because we have no real reason to declare it where it was. The added comment has also been removed since it doesn't make sense and isn't useful for the comprehension of this variable. The variable will stay in this file unless we have a real reason to move it out of this file. --- bin/automake.in | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/bin/automake.in b/bin/automake.in index ca9548518..dfcab7a98 100755 --- a/bin/automake.in +++ b/bin/automake.in @@ -133,23 +133,6 @@ sub usage (); sub version (); sub yacc_lex_finish_helper (); -# This variable was kept here because it uses the \$RELEASE_YEAR variable -# which is passed directly to this script by the Makefile. We need to find a -# better solution. -# Copyright on generated Makefile.ins. -my $gen_copyright = "\ -# Copyright (C) 1994-$RELEASE_YEAR Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -"; - ################################################################ Automake::Variable::hook ('SUFFIXES', \&var_SUFFIXES_trigger); @@ -5926,6 +5909,21 @@ sub read_am_file } +# Copyright on generated Makefile.ins. +my $gen_copyright = "\ +# Copyright (C) 1994-$RELEASE_YEAR Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. +"; + + # read_main_am_file ($MAKEFILE_AM, $MAKEFILE_IN) # ---------------------------------------------- sub read_main_am_file -- cgit v1.2.1