From: Koichiro IWAO
Date: Wed, 23 Sep 2020 02:23:50 +0000 (+0900)
Subject: Replace some more hard-coded /etc with sysconfdir
X-Git-Tag: v1.11.90~102^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=67b60e645c5519b1b1f54ec1b0c7dbd5dfb04bcf;p=tigervnc.git
Replace some more hard-coded /etc with sysconfdir
---
diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in
index 25fbbd31..9583bf45 100755
--- a/unix/vncserver/vncserver.in
+++ b/unix/vncserver/vncserver.in
@@ -38,7 +38,7 @@
$vncUserDir = "$ENV{HOME}/.vnc";
$vncUserConfig = "$vncUserDir/config";
-$vncSystemConfigDir = "/etc/tigervnc";
+$vncSystemConfigDir = "@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc";
$vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults";
$vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory";
diff --git a/unix/vncserver/vncserver@.service.in b/unix/vncserver/vncserver@.service.in
index 584ecf4b..3e90f098 100644
--- a/unix/vncserver/vncserver@.service.in
+++ b/unix/vncserver/vncserver@.service.in
@@ -1,7 +1,7 @@
# The vncserver service unit file
#
# Quick HowTo:
-# 1. Add a user mapping to /etc/tigervnc/vncserver.users.
+# 1. Add a user mapping to @CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver.users.
# 2. Adjust the global or user configuration. See the
# vncsession(8) manpage for details. (OPTIONAL)
# 3. Run `systemctl enable vncserver@:.service`