[X2Go-Commits] [nx-libs] 210/429: Xext: use $USRDATADIR/SecurityPolicy

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 689f811ba1bac8caee40e50149127e5c81ec575c
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Jan 16 23:29:04 2021 +0100

    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
---
 nx-X11/programs/Xserver/Xext/Imakefile | 5 ++---
 1 file 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()

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git