diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index db1f219a0..7463941c9 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -24,7 +24,7 @@ if(NOT CPACK_PACKAGE_NAME) set(CPACK_PACKAGE_NAME "linphone") endif () -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt") set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) diff --git a/build/rpm/linphone.spec.cmake b/build/rpm/linphone.spec.cmake index 440df670d..4328f3c33 100644 --- a/build/rpm/linphone.spec.cmake +++ b/build/rpm/linphone.spec.cmake @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE CHANGELOG.md README.md +%doc LICENSE.txt CHANGELOG.md README.md %{_bindir}/ %{_datadir}/ diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index a022e3f6c..6134ab0ec 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -263,7 +263,7 @@ if (LINPHONE_MICRO_VERSION) endif () set(CPACK_PACKAGE_EXECUTABLES "${EXECUTABLE_NAME};${APPLICATION_NAME}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${APPLICATION_NAME}") -set(CPACK_RESOURCE_FILE_LICENSE "${LINPHONE_SOURCE_DIR}/COPYING") +set(CPACK_RESOURCE_FILE_LICENSE "${LINPHONE_DESKTOP_DIR}/LICENSE.txt") if (APPLE) set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-mac") diff --git a/config.h.cmake b/config.h.cmake deleted file mode 100644 index 06f848cb8..000000000 --- a/config.h.cmake +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* -* config.h.cmake -* Copyright (C) 2017-2018 Belledonne Communications, Grenoble France -* -******************************************************************************** -* -* This program 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 -* of the License, or (at your option) any later version. -* -* This program 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, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* -*******************************************************************************/ - -#cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" -#cmakedefine ENABLE_UPDATE_CHECK 1 -#cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" -#cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}"