Changeset: 950a8670e62e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=950a8670e62e
Modified Files:
documentation/source/manual_pages/mserver5.rst.in
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Have cmake replace configuration values properly.
diffs (67 lines):
diff --git a/documentation/source/manual_pages/mserver5.rst.in
b/documentation/source/manual_pages/mserver5.rst.in
--- a/documentation/source/manual_pages/mserver5.rst.in
+++ b/documentation/source/manual_pages/mserver5.rst.in
@@ -52,7 +52,7 @@ MSERVER5 OPTIONS
**--dbpath=**\ *path*
Path where *mserver5* should find a database. Shorthand for option
**gdk_dbpath**. Default value:
- **@localstatedir@/monetdb5/dbfarm/demo**.
+ **@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5/dbfarm/demo**.
**--dbextra=**\ *path*
Path where *mserver5* should store transient data. Default value is
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=@Elogdir@/merovingian.log
-pidfile=@Erundir@/merovingian.pid
+logfile=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb/merovingian.log
+pidfile=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/monetdb/merovingian.pid
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
-@Elogdir@/merovingian.log {
+@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb/merovingian.log {
su monetdb monetdb
missingok
notifempty
postrotate
- [ -s @Erundir@/merovingian.pid ] && kill -HUP $(cat
@Erundir@/merovingian.pid)
+ [ -s
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/monetdb/merovingian.pid ] && kill -HUP
$(cat @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/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
@@ -7,10 +7,10 @@ After=network.target
Type=forking
User=monetdb
Group=monetdb
-ExecStart=@Ebindir@/monetdbd start @Elocalstatedir@/monetdb5/dbfarm
-ExecStop=@Ebindir@/monetdbd stop @Elocalstatedir@/monetdb5/dbfarm
+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=@Erundir@/merovingian.pid
+PIDFile=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/monetdb/merovingian.pid
PrivateDevices=no
ProtectSystem=full
ProtectHome=read-only
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -60,7 +60,7 @@ should find a database.
Shorthand for option
.BR gdk_dbpath .
Default value:
-.BR @localstatedir@/monetdb5/dbfarm/demo .
+.BR @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5/dbfarm/demo .
.TP
\fB\-\-dbextra=\fP\fIpath\fP
Path where
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
