MonetDB: Oct2020 - Work around cmake not honoring config time *_...

[Sjoerd Mullender]

Changeset: e68ac13a45fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e68ac13a45fe
Modified Files:
        MonetDB.spec
        sql/NT/CMakeLists.txt
        tools/merovingian/daemon/config/CMakeLists.txt
        tools/mserver/CMakeLists.txt
Branch: Oct2020
Log Message:

Work around cmake not honoring config time *_FULL_* variables during install.
The GNUInstallDirs module gives you variables like
CMAKE_INSTALL_SYSCONFDIR (value "etc") and
CMAKE_INSTALL_FULL_SYSCONFDIR (value "/etc" if the prefix is "/usr"),
but installation still goes to /usr/etc.


diffs (55 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -815,7 +815,10 @@ export CFLAGS
 %cmake3_build
 
 %install
+mkdir -p "%{buildroot}/usr"
+for d in etc var; do mkdir "%{buildroot}/$d"; ln -s ../$d 
"%{buildroot}/usr/$d"; done
 %cmake3_install
+rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc"
 
 # move file to correct location
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
diff --git a/sql/NT/CMakeLists.txt b/sql/NT/CMakeLists.txt
--- a/sql/NT/CMakeLists.txt
+++ b/sql/NT/CMakeLists.txt
@@ -14,7 +14,7 @@ if(WIN32)
     COMPONENT server)
   install(FILES
     .monetdb
-    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
     COMPONENT server)
 endif()
 
diff --git a/tools/merovingian/daemon/config/CMakeLists.txt 
b/tools/merovingian/daemon/config/CMakeLists.txt
--- a/tools/merovingian/daemon/config/CMakeLists.txt
+++ b/tools/merovingian/daemon/config/CMakeLists.txt
@@ -35,11 +35,11 @@ install(FILES
   COMPONENT sql)
 
 install(DIRECTORY 
-  DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb
+  DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/log/monetdb
   COMPONENT sql)
 
 install(DIRECTORY 
-  DESTINATION ${CMAKE_INSTALL_FULL_RUNSTATEDIR}/monetdb
+  DESTINATION ${CMAKE_INSTALL_RUNSTATEDIR}/monetdb
   COMPONENT sql)
 
 # vim: set ts=2:sw=2:et
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -118,7 +118,7 @@ install(DIRECTORY DESTINATION
   ${CMAKE_INSTALL_DATADIR}
   COMPONENT server)
 install(DIRECTORY DESTINATION
-  ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/monetdb5/dbfarm
+  ${CMAKE_INSTALL_LOCALSTATEDIR}/monetdb5/dbfarm
   COMPONENT server)
 
 install(FILES
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list