diff options
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -2962,7 +2962,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then ;; esac if [ '!' -f "$outpath/LICENSE" ]; then - echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with" + echo "The LICENSE, LICENSE.GPL LICENSE.LGPL file shipped with" echo "this software has disappeared." echo echo "Sorry, you are not licensed to use this software." @@ -2999,7 +2999,7 @@ if [ "$Edition" = "OpenSource" ]; then while true; do echo "You are licensed to use this software under the terms of" echo "the Lesser GNU General Public License (LGPL) versions 2.1." - if [ -f "$relpath/LICENSE.GPL3" ]; then + if [ -f "$relpath/LICENSE.GPL" ]; then echo "You are also licensed to use this software under the terms of" echo "the GNU General Public License (GPL) versions 3." affix="either" @@ -3011,7 +3011,7 @@ if [ "$Edition" = "OpenSource" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - if [ -f "$relpath/LICENSE.GPL3" ]; then + if [ -f "$relpath/LICENSE.GPL" ]; then echo "Type '3' to view the GNU General Public License version 3." fi echo "Type 'L' to view the Lesser GNU General Public License version 2.1." @@ -3029,7 +3029,7 @@ if [ "$Edition" = "OpenSource" ]; then echo exit 1 elif [ "$acceptance" = "3" ]; then - more "$relpath/LICENSE.GPL3" + more "$relpath/LICENSE.GPL" elif [ "$acceptance" = "L" ]; then more "$relpath/LICENSE.LGPL" fi diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9995fb179e..f71d0cf9a8 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4215,7 +4215,7 @@ bool Configure::showLicense(QString orgLicenseFile) QString licenseFile = orgLicenseFile; QString theLicense; if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { - haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3"); + haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL"); theLicense = "GNU Lesser General Public License (LGPL) version 2.1"; if (haveGpl3) theLicense += "\nor the GNU General Public License (GPL) version 3"; @@ -4255,7 +4255,7 @@ bool Configure::showLicense(QString orgLicenseFile) } else { if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (accept == '3') - licenseFile = orgLicenseFile + "/LICENSE.GPL3"; + licenseFile = orgLicenseFile + "/LICENSE.GPL"; else licenseFile = orgLicenseFile + "/LICENSE.LGPL"; } @@ -4292,7 +4292,7 @@ void Configure::readLicense() dictionary["LICENSE FILE"] = sourcePath; bool openSource = false; - bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL"); + bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL"); if (dictionary["BUILDTYPE"] == "commercial") { openSource = false; } else if (dictionary["BUILDTYPE"] == "opensource") { |