* Update to GPLv3

* Update copyright to 2007
* Fix download URL for translation files (thanks to Thiemo Seufer)

13 files changed, 76 insertions, 74 deletions

diff --git a/w32/Makefile.am b/w32/Makefile.am
index 8c14b8f..77c6e97 100644
--- a/w32/Makefile.am
+++ b/w32/Makefile.am
@@ -1,19 +1,20 @@
 # Makefile.am to create libw32.a for mingw32 host.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+# 2007 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
-# GNU Make 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 2, or (at your option) any later version.
+# GNU Make 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.
 #
 # GNU Make 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.
+# 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
-# GNU Make; see the file COPYING.  If not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# this program.  If not, see <http://www.gnu.org/licenses/>.
 
 noinst_LIBRARIES = libw32.a
 
diff --git a/w32/compat/dirent.c b/w32/compat/dirent.c
index 491ff3f..0664a16 100644
--- a/w32/compat/dirent.c
+++ b/w32/compat/dirent.c
@@ -1,19 +1,19 @@
 /* Directory entry code for Window platforms.

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 

 #include <sys/types.h>

diff --git a/w32/include/dirent.h b/w32/include/dirent.h
index 2d6247e..818cf06 100644
--- a/w32/include/dirent.h
+++ b/w32/include/dirent.h
@@ -1,19 +1,19 @@
 /* Windows version of dirent.h
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make 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 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make 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
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _DIRENT_H
 #define _DIRENT_H
diff --git a/w32/include/pathstuff.h b/w32/include/pathstuff.h
index 0288496..328ed05 100644
--- a/w32/include/pathstuff.h
+++ b/w32/include/pathstuff.h
@@ -1,19 +1,19 @@
 /* Definitions for Windows path manipulation.
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make 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 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make 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
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PATHSTUFF_H
 #define _PATHSTUFF_H
diff --git a/w32/include/sub_proc.h b/w32/include/sub_proc.h
index 1ca9f64..38889c5 100644
--- a/w32/include/sub_proc.h
+++ b/w32/include/sub_proc.h
@@ -1,19 +1,19 @@
 /* Definitions for Windows process invocation.

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 #ifndef SUB_PROC_H

 #define SUB_PROC_H

diff --git a/w32/include/w32err.h b/w32/include/w32err.h
index d2693b4..0a27fce 100644
--- a/w32/include/w32err.h
+++ b/w32/include/w32err.h
@@ -1,19 +1,19 @@
 /* Definitions for Windows error handling.

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 #ifndef _W32ERR_H_

 #define _W32ERR_H_

diff --git a/w32/pathstuff.c b/w32/pathstuff.c
index 7f88010..0622349 100644
--- a/w32/pathstuff.c
+++ b/w32/pathstuff.c
@@ -1,19 +1,19 @@
 /* Path conversion for Windows pathnames.
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make 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 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make 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
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/w32/subproc/NMakefile b/w32/subproc/NMakefile
index 90be58d..1330ab0 100644
--- a/w32/subproc/NMakefile
+++ b/w32/subproc/NMakefile
@@ -2,20 +2,21 @@
 # `build.bat' instead.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006 Free Software Foundation, Inc.
+# 2006, 2007 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
-# GNU Make 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 2, or (at your option) any later version.
+# GNU Make 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.
 #
 # GNU Make 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.
+# 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
-# GNU Make; see the file COPYING.  If not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #
 #       NMakefile for GNU Make (subproc library)
diff --git a/w32/subproc/build.bat b/w32/subproc/build.bat
index 8cb15ab..9146c2b 100644
--- a/w32/subproc/build.bat
+++ b/w32/subproc/build.bat
@@ -18,17 +18,18 @@ gcc -mthreads -Wall -gstabs+ -ggdb3 -O2 -I.. -I. -I../include -I../.. -DWINDOWS3
 

 @echo off

 rem Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-rem 2005, 2006 Free Software Foundation, Inc.

+rem 2005, 2006, 2007 Free Software Foundation, Inc.

 rem This file is part of GNU Make.

-

-rem GNU Make is free software; you can redistribute it and/or modify it under the

-rem terms of the GNU General Public License as published by the Free Software

-rem Foundation; either version 2, or (at your option) any later version.

-

-rem GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY

-rem WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR

-rem A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

-

-rem You should have received a copy of the GNU General Public License along with

-rem GNU Make; see the file COPYING.  If not, write to the Free Software

-rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

+rem

+rem GNU Make is free software; you can redistribute it and/or modify it under

+rem the terms of the GNU General Public License as published by the Free

+rem Software Foundation; either version 3 of the License, or (at your option)

+rem any later version.

+rem

+rem GNU Make is distributed in the hope that it will be useful, but WITHOUT

+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for.

+rem more details.

+rem

+rem You should have received a copy of the GNU General Public License along

+rem with this program.  If not, see <http://www.gnu.org/licenses/>.

diff --git a/w32/subproc/misc.c b/w32/subproc/misc.c
index 74af09b..4d5aab5 100644
--- a/w32/subproc/misc.c
+++ b/w32/subproc/misc.c
@@ -1,19 +1,19 @@
 /* Process handling for Windows

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 #include <stddef.h>

 #include <stdlib.h>

diff --git a/w32/subproc/proc.h b/w32/subproc/proc.h
index 48b4186..270232b 100644
--- a/w32/subproc/proc.h
+++ b/w32/subproc/proc.h
@@ -1,19 +1,19 @@
 /* Definitions for Windows

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 #ifndef  _PROC_H

 #define _PROC_H

diff --git a/w32/subproc/sub_proc.c b/w32/subproc/sub_proc.c
index 8ba9ac3..80dbf0a 100644
--- a/w32/subproc/sub_proc.c
+++ b/w32/subproc/sub_proc.c
@@ -1,19 +1,19 @@
 /* Process handling for Windows.
 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make 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 2, or (at your option) any later version.
+Foundation; either version 3 of the License, or (at your option) any later
+version.
 
 GNU Make 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
-GNU Make; see the file COPYING.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */
+this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/w32/subproc/w32err.c b/w32/subproc/w32err.c
index 47716d5..43f8d14 100644
--- a/w32/subproc/w32err.c
+++ b/w32/subproc/w32err.c
@@ -1,19 +1,19 @@
 /* Error handling for Windows

 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-2006 Free Software Foundation, Inc.

+2006, 2007 Free Software Foundation, Inc.

 This file is part of GNU Make.

 

 GNU Make 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 2, or (at your option) any later version.

+Foundation; either version 3 of the License, or (at your option) any later

+version.

 

 GNU Make 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

-GNU Make; see the file COPYING.  If not, write to the Free Software

-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.  */

+this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

 #include <windows.h>

 #include "w32err.h"

@@ -68,4 +68,3 @@ static char szMessageBuffer[128];
 	}

     return szMessageBuffer;

 }

-