From 891ebd4d9766c1fb0bd11bd0fe8ef3ca871d4bc0 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 4 Jul 2007 19:35:15 +0000 Subject: * Update to GPLv3 * Update copyright to 2007 * Fix download URL for translation files (thanks to Thiemo Seufer) --- main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index c046629..e5a1c88 100644 --- a/main.c +++ b/main.c @@ -6,15 +6,15 @@ 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 . */ #include "make.h" #include "dep.h" @@ -2956,26 +2956,26 @@ print_version (void) /* Do it only once. */ return; + printf ("%sGNU Make %s\n", precede, version_string); + + if (!remote_description || *remote_description == '\0') + printf (_("%sBuilt for %s\n"), precede, make_host); + else + printf (_("%sBuilt for %s (%s)\n"), + precede, make_host, remote_description); + /* Print this untranslated. The coding standards recommend translating the (C) to the copyright symbol, but this string is going to change every year, and none of the rest of it should be translated (including the word "Copyright", so it hardly seems worth it. */ - printf ("%sGNU Make %s\n\ -%sCopyright (C) 2006 Free Software Foundation, Inc.\n", - precede, version_string, precede); + printf ("%sCopyright (C) 2007 Free Software Foundation, Inc.\n", precede); - printf (_("%sThis is free software; see the source for copying conditions.\n\ -%sThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ -%sPARTICULAR PURPOSE.\n"), + printf (_("%sLicense GPLv3+: GNU GPL version 3 or later \n\ +%sThis is free software: you are free to change and redistribute it.\n\ +%sThere is NO WARRANTY, to the extent permitted by law.\n"), precede, precede, precede); - if (!remote_description || *remote_description == '\0') - printf (_("\n%sThis program built for %s\n"), precede, make_host); - else - printf (_("\n%sThis program built for %s (%s)\n"), - precede, make_host, remote_description); - printed_version = 1; /* Flush stdout so the user doesn't have to wait to see the -- cgit v1.2.3