From 935c2b0850d5a2c5db6255d847ff77336012354b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 2 Dec 2020 09:31:59 +0100 Subject: [PATCH 1/2] Remove redundant mixxx folder inside the doc dir --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d817c72634..81a0335245b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1033,7 +1033,7 @@ elseif (UNIX) include(GNUInstallDirs) set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") set(MIXXX_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mixxx") - set(MIXXX_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}/mixxx") + set(MIXXX_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}") set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DATADIR}/licenses/mixxx") endif() From d2dba5696cba796b89da460884cbef323e90ba5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 2 Dec 2020 09:53:05 +0100 Subject: [PATCH 2/2] move licenses to doc folder and use CMAKE_PROJECT_NAME macro --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81a0335245b..304f048c5a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1032,9 +1032,9 @@ if (APPLE AND MACOS_BUNDLE) elseif (UNIX) include(GNUInstallDirs) set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") - set(MIXXX_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mixxx") + set(MIXXX_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}") set(MIXXX_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}") - set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DATADIR}/licenses/mixxx") + set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DOCDIR}") endif() if(WIN32)