Changeset: 0977e4dc2192 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0977e4dc2192
Modified Files:
MonetDB.spec
buildtools/conf/monetdbd.conf.in
cmake/monetdb-defines.cmake
debian/rules
misc/selinux/monetdb.fc.in
misc/selinux/post_install_script_file.in
misc/selinux/post_uninstall_script_file.in
monetdb_config.h.in
sql/NT/CMakeLists.txt
testing/CMakeLists.txt
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/CMakeLists.txt
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
tools/mserver/CMakeLists.txt
Branch: Oct2020
Log Message:
Cleanup of cmake install variables; get rid of LOGDIR and RUNDIR.
Use full install path names for SYSCONFDIR, LOCALSTATEDIR, and
RUNSTATEDIR since they are treated specially by cmake (see
GNUInstallDirs.cmake). This is important if installing in / or /usr.
diffs (202 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -784,8 +784,6 @@ export CFLAGS
%endif
%cmake3 \
-DRELEASE_VERSION=ON \
- -DRUNDIR=%{_rundir}/monetdb \
- -DLOGDIR=%{_localstatedir}/log/monetdb \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in
--- a/buildtools/conf/monetdbd.conf.in
+++ b/buildtools/conf/monetdbd.conf.in
@@ -1,3 +1,3 @@
# this file is for systemd
# monetdbd needs a directory in /run that is owned by monetdb:monetdb
-d @RUNDIR@ 0775 monetdb monetdb -
+d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb -
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -221,17 +221,9 @@ macro(monetdb_macro_variables)
set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
set(INFODIR "${CMAKE_INSTALL_FULL_INFODIR}")
set(LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}")
- set(LOCALSTATE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
# set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}")
set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
- set(LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb"
- CACHE PATH
- "Where to put log files (default LOCALSTATEDIR/log/monetdb)")
set(PKGCONFIGDIR "${LIBDIR}/pkgconfig")
- set(RUNDIR
- "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb"
- CACHE PATH
- "Where to put pid files (default LOCALSTATEDIR/run/monetdb)")
endmacro()
macro(monetdb_configure_crypto)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
-DRELEASE_VERSION=ON \
- -DRUNDIR=/run/monetdb \
- -DLOGDIR=/var/log/monetdb \
-DASSERT=OFF \
-DCINTEGRATION=ON \
-DFITS=ON \
diff --git a/misc/selinux/monetdb.fc.in b/misc/selinux/monetdb.fc.in
--- a/misc/selinux/monetdb.fc.in
+++ b/misc/selinux/monetdb.fc.in
@@ -1,7 +1,7 @@
@CMAKE_INSTALL_FULL_BINDIR@/monetdbd --
gen_context(system_u:object_r:monetdbd_exec_t,s0)
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 --
gen_context(system_u:object_r:mserver5_exec_t,s0)
@CMAKE_INSTALL_FULL_LIBDIR@/systemd/system/monetdbd.*
gen_context(system_u:object_r:monetdbd_unit_file_t,s0)
-@LOGDIR@(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
+@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
# for some reason we cannot use /run/monetdb here, even though that is the
real name
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
# database "farm"
diff --git a/misc/selinux/post_install_script_file.in
b/misc/selinux/post_install_script_file.in
--- a/misc/selinux/post_install_script_file.in
+++ b/misc/selinux/post_install_script_file.in
@@ -5,5 +5,5 @@ do
done
# use /var/run/monetdb since that's what it says in the monetdb.fc file
# it says that because /run/monetdb for some reason doesn't work
-/sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5 @LOGDIR@
@RUNDIR@ @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
+/sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb
@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
/usr/bin/systemctl try-restart monetdbd.service
diff --git a/misc/selinux/post_uninstall_script_file.in
b/misc/selinux/post_uninstall_script_file.in
--- a/misc/selinux/post_uninstall_script_file.in
+++ b/misc/selinux/post_uninstall_script_file.in
@@ -7,7 +7,7 @@ if [ $1 -eq 0 ] ; then
do
/usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || :
done
- /sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5 @LOGDIR@
$RUNDIR@ @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
+ /sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb
@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
if [ $active = active ]; then
/usr/bin/systemctl start monetdbd.service
fi
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -213,20 +213,7 @@
#cmakedefine BINDIR "@BINDIR@"
#cmakedefine LIBDIR "@LIBDIR@"
-#cmakedefine DATADIR "@DATADIR@"
#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@"
-// #cmakedefine QXLOCALSTATEDIR
-// #cmakedefine MONETDB_PREFIX
-#cmakedefine DATAROOTDIR "@DATAROOTDIR@"
-#cmakedefine INCLUDEDIR "@INCLUDEDIR@"
-#cmakedefine INFODIR "@INFODIR@"
-#cmakedefine LIBEXECDIR "@LIBEXECDIR@"
-#cmakedefine LOCALSTATE_DIR "@LOCALSTATE_DIR@"
-//#cmakedefine MANDIR "@MANDIR@"
-#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine LOGDIR "@LOGDIR@"
-#cmakedefine PKGCONFIGDIR "@PKGCONFIGDIR@"
-#cmakedefine RUNDIR "@RUNDIR@"
// End Section: monetdb macro variables
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_SYSCONFDIR}
+ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
COMPONENT server)
endif()
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -32,7 +32,7 @@ else()
set(QXPYTHON_LIBDIR "${PYTHON3_LIBDIR}")
endif()
set(QXSOURCE "${CMAKE_SOURCE_DIR}")
-set(QXsysconfdir "${CMAKE_INSTALL_SYSCONFDIR}")
+set(QXsysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
set(SOURCE "${CMAKE_SOURCE_DIR}")
if (HAVE_CURL)
diff --git a/tools/merovingian/daemon/config/.merovingian_properties.in
b/tools/merovingian/daemon/config/.merovingian_properties.in
--- a/tools/merovingian/daemon/config/.merovingian_properties.in
+++ b/tools/merovingian/daemon/config/.merovingian_properties.in
@@ -12,5 +12,5 @@
# is, however, crucial that the file locations in this file are present.
-logfile=@LOGDIR@/merovingian.log
-pidfile=@RUNDIR@/merovingian.pid
+logfile=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb/merovingian.log
+pidfile=@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb/merovingian.pid
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 ${LOGDIR}
+ DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb
COMPONENT sql)
install(DIRECTORY
- DESTINATION ${RUNDIR}
+ DESTINATION ${CMAKE_INSTALL_FULL_RUNSTATEDIR}/monetdb
COMPONENT sql)
# vim: set ts=2:sw=2:et
diff --git a/tools/merovingian/daemon/config/monetdbd.in
b/tools/merovingian/daemon/config/monetdbd.in
--- a/tools/merovingian/daemon/config/monetdbd.in
+++ b/tools/merovingian/daemon/config/monetdbd.in
@@ -1,9 +1,9 @@
# this is the logrotate configuration for merovingian
-@LOGDIR@/merovingian.log {
+@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb/merovingian.log {
su monetdb monetdb
missingok
notifempty
postrotate
- [ -s @RUNDIR@/merovingian.pid ] && kill -HUP $(cat
@RUNDIR@/merovingian.pid)
+ [ -s @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb/merovingian.pid ]
&& kill -HUP $(cat @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb/merovingian.pid)
endscript
}
diff --git a/tools/merovingian/daemon/config/monetdbd.service.in
b/tools/merovingian/daemon/config/monetdbd.service.in
--- a/tools/merovingian/daemon/config/monetdbd.service.in
+++ b/tools/merovingian/daemon/config/monetdbd.service.in
@@ -10,7 +10,7 @@ Group=monetdb
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/monetdbd start
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5/dbfarm
ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/monetdbd stop
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5/dbfarm
Restart=on-failure
-PIDFile=@RUNDIR@/merovingian.pid
+PIDFile=@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb/merovingian.pid
PrivateDevices=no
ProtectSystem=full
ProtectHome=read-only
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_LOCALSTATEDIR}/monetdb5/dbfarm
+ ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/monetdb5/dbfarm
COMPONENT server)
install(FILES
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
