Update the copyright years and put the licensing text directly

into the template file.  The license needs to be version dependent, so burn
it in directly.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136566 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 23 insertions, 9 deletions

diff --git a/fixincludes/fixincl.tpl b/fixincludes/fixincl.tpl
index b4818aaea1c..af92d15c8d9 100644
--- a/fixincludes/fixincl.tpl
+++ b/fixincludes/fixincl.tpl
@@ -2,7 +2,10 @@
 x=fixincl.x =]
 [= (dne " * " "/* ")=]
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER [=`date`=]
+/* DO NOT SVN-MERGE THIS FILE, EITHER [=
+   (define re-ct 0) (define max-mach 0) (define ct 0)
+   (define HACK "") (define Hack "")    (define tmp "") 
+   (shell "date") =]
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,12 +18,22 @@ x=fixincl.x =]
  *
  * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000, 2001
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ *                         2006, 2007, 2008
  *  The Free Software Foundation, Inc.
  *
- [=(define re-ct 0) (define max-mach 0) (define ct 0)
-   (define HACK "") (define Hack "")    (define tmp "")
-   (gpl "inclhack" " *  ")=]
+ *  inclhack is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  inclhack is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 [=
 
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 131de29fba2..f91bb3a1ca5 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Sunday June  8, 2008 at 09:04:48 AM PDT
+ * It has been AutoGen-ed  Sunday June  8, 2008 at 09:19:13 AM PDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun  8 09:04:48 PDT 2008
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jun  8 09:19:13 PDT 2008
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -19,10 +19,11 @@
  *
  * See README for more information.
  *
- *  inclhack copyright (c) 1998, 1999, 2000, 2001
+ *  inclhack copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ *                         2006, 2007, 2008
  *  The Free Software Foundation, Inc.
  *
-  *  inclhack is free software: you can redistribute it and/or modify it
+ *  inclhack is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.