Skip to content

N
nx-libs
Commit 689f811b authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
1 Browse files
Options

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
parent f4782bbd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
nx-X11/programs/Xserver/Xext/Imakefile
View file @ 689f811b
...@@ -56,8 +56,7 @@ XF86BIGFOBJS = xf86bigfont.o ...@@ -56,8 +56,7 @@ XF86BIGFOBJS = xf86bigfont.o
#if BuildXCSecurity #if BuildXCSecurity
SECURITYSRCS = security.c SECURITYSRCS = security.c
SECURITYOBJS = security.o SECURITYOBJS = security.o
SERVERCONFIGDIR = ServerConfigDir POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(USRDATADIR)/SecurityPolicy\"
POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGDIR)/SecurityPolicy\"
#endif #endif
#if BuildXinerama #if BuildXinerama
PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
...@@ -125,7 +124,7 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) ...@@ -125,7 +124,7 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
LinkConfDirectory(xserver,.,xserver,.) LinkConfDirectory(xserver,.,xserver,.)
#if BuildXCSecurity && InstallSecurityConfig #if BuildXCSecurity && InstallSecurityConfig
InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) InstallNonExecFile(SecurityPolicy,$(USRDATADIR))
#endif #endif
DependTarget() DependTarget()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment