diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-18 11:41:47 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-18 11:41:47 +0100 |
| commit | 24b903be52601b223f9527cd28334cb3d9e3aad0 (patch) | |
| tree | 42847fa64d1e5a9ce14517a16250cc35fa1837a1 /nx-X11/programs/Xserver/Xext/Imakefile | |
| parent | f4782bbd2c3e98176cd34ed1bfabba954d9489e4 (diff) | |
| parent | a26011503c7c64549a11ff679f504f3ad2dce081 (diff) | |
| download | nx-libs-24b903be52601b223f9527cd28334cb3d9e3aad0.tar.gz nx-libs-24b903be52601b223f9527cd28334cb3d9e3aad0.tar.bz2 nx-libs-24b903be52601b223f9527cd28334cb3d9e3aad0.zip | |
Merge branch 'uli42-pr/drop_alternative_securitypolicy' into 3.6.x
Attributes GH PR #989: https://github.com/ArcticaProject/nx-libs/pull/989
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/Imakefile | 5 |
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() |