diff options
author | Jakub Bogusz | 2006-10-14 20:25:29 (GMT) |
---|---|---|
committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
commit | bf4a6038bdb0013f1cdc5adc74a22c12672a228f (patch) | |
tree | 36afc13bd515b58af382753077a7d5cff9e5edb8 /XFree86-xdm-fixes.patch | |
parent | d0f440e1dbfc857441d679620d39e4b4c429f52e (diff) | |
download | X11-bf4a6038bdb0013f1cdc5adc74a22c12672a228f.zip X11-bf4a6038bdb0013f1cdc5adc74a22c12672a228f.tar.gz |
- fixed SU and XDMAUTHDIR substitution in xdm-config
Changed files:
XFree86-xdm-fixes.patch -> 1.11
Diffstat (limited to 'XFree86-xdm-fixes.patch')
-rw-r--r-- | XFree86-xdm-fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch index 51381ea..196e85e 100644 --- a/XFree86-xdm-fixes.patch +++ b/XFree86-xdm-fixes.patch @@ -69,9 +69,9 @@ diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) +#ifdef LinuxArchitecture -+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) ++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) +#else -+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) ++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) +#endif /* LinuxArchitecture */ CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) |