- AUTHDIR=XDMVARDIR on Linux

[packages/X11.git] / XFree86-Xwrapper.patch

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index 4313c78b0b54636587fe313fa378bf71cb1707a7..44e71c22f6cac440803a7ae20f015f14cf5c9d13 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -80,11 +80,12 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
  #include <Server.tmpl>
  
  #ifdef XFree86Version
-@@ -1146,6 +1141,11 @@
+@@ -1146,6 +1141,12 @@
  #endif /* XnestServer */
  
  
 +#if UseXserverWrapper
++all:: Xwrapper
 +SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
 +InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
 +#endif
@@ -121,7 +122,7 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/pro
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
-+#if UseXserverWrapper
++#if UseXserverWrapper && XF86Server
 +AllTarget(wrapper.o)
 +
 +       WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"