From 02da591c560a499eedd5687177ec4f1583bca4d8 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Wed, 16 Sep 2020 23:18:29 +0900 Subject: [PATCH] Do not assume sysconfdir is always /etc Refer @CMAKE_INSTALL_FULL_SYSCONF@ instead. --- unix/vncserver/CMakeLists.txt | 1 + unix/vncserver/{vncsession.man => vncsession.man.in} | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) rename unix/vncserver/{vncsession.man => vncsession.man.in} (85%) diff --git a/unix/vncserver/CMakeLists.txt b/unix/vncserver/CMakeLists.txt index eeb4b7b0..71d5feec 100644 --- a/unix/vncserver/CMakeLists.txt +++ b/unix/vncserver/CMakeLists.txt @@ -4,6 +4,7 @@ target_link_libraries(vncsession ${PAM_LIBS}) configure_file(vncserver@.service.in vncserver@.service @ONLY) configure_file(vncsession-start.in vncsession-start @ONLY) configure_file(vncserver.in vncserver @ONLY) +configure_file(vncsession.man.in vncsession.man @ONLY) install(TARGETS vncsession DESTINATION ${CMAKE_INSTALL_FULL_SBINDIR}) install(FILES tigervnc.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME tigervnc) diff --git a/unix/vncserver/vncsession.man b/unix/vncserver/vncsession.man.in similarity index 85% rename from unix/vncserver/vncsession.man rename to unix/vncserver/vncsession.man.in index 21382093..4efad41b 100644 --- a/unix/vncserver/vncsession.man +++ b/unix/vncserver/vncsession.man.in @@ -19,22 +19,22 @@ manager. .SH FILES Several VNC-related files are found in the directory $HOME/.vnc: .TP -/etc/tigervnc/vncserver-config-defaults +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-defaults The optional system-wide equivalent of $HOME/.vnc/config. If this file exists and defines options to be passed to Xvnc, they will be used as defaults for users. The user's $HOME/.vnc/config overrides settings configured in this file. The overall configuration file load order is: this file, $HOME/.vnc/config, -and then /etc/tigervnc/vncserver-config-mandatory. None are required to exist. +and then @CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory. None are required to exist. .TP -/etc/tigervnc/vncserver-config-mandatory +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory The optional system-wide equivalent of $HOME/.vnc/config. If this file exists and defines options to be passed to Xvnc, they will override any of the same options defined in a user's $HOME/.vnc/config. This file offers a mechanism to establish some basic form of system-wide policy. WARNING! There is nothing stopping users from constructing their own vncsession-like script that calls Xvnc directly to bypass any options defined in -/etc/tigervnc/vncserver-config-mandatory. The overall configuration file load -order is: /etc/tigervnc/vncserver-config-defaults, $HOME/.vnc/config, and then +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory. The overall configuration file load +order is: @CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-defaults, $HOME/.vnc/config, and then this file. None are required to exist. .TP $HOME/.vnc/config -- 2.39.5