aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-01-16 23:29:04 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-18 11:40:37 +0100
commit689f811ba1bac8caee40e50149127e5c81ec575c (patch)
treedc43109c1efe994d8f3b95425910aaf93dd07112 /nx-X11/programs/Xserver
parentf4782bbd2c3e98176cd34ed1bfabba954d9489e4 (diff)
downloadnx-libs-689f811ba1bac8caee40e50149127e5c81ec575c.tar.gz
nx-libs-689f811ba1bac8caee40e50149127e5c81ec575c.tar.bz2
nx-libs-689f811ba1bac8caee40e50149127e5c81ec575c.zip
Xext: use $USRDATADIR/SecurityPolicy
This reflects the path where the file is placed after installation. It also obsoletes the NX_ALTERNATIVEPOLICYFILE. Fixes ArcticaProject/nx-libs#988
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index 540ac80fa..c3bb8391f 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -56,8 +56,7 @@ XF86BIGFOBJS = xf86bigfont.o
#if BuildXCSecurity
SECURITYSRCS = security.c
SECURITYOBJS = security.o
- SERVERCONFIGDIR = ServerConfigDir
- POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGDIR)/SecurityPolicy\"
+ POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(USRDATADIR)/SecurityPolicy\"
#endif
#if BuildXinerama
PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
@@ -125,7 +124,7 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
LinkConfDirectory(xserver,.,xserver,.)
#if BuildXCSecurity && InstallSecurityConfig
-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
+InstallNonExecFile(SecurityPolicy,$(USRDATADIR))
#endif
DependTarget()