Author: qboosh Date: Sat Oct 14 20:25:34 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixed SU and XDMAUTHDIR substitution in xdm-config
---- Files affected:
SOURCES:
XFree86-xdm-fixes.patch (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/XFree86-xdm-fixes.patch
diff -u SOURCES/XFree86-xdm-fixes.patch:1.10
SOURCES/XFree86-xdm-fixes.patch:1.11
--- SOURCES/XFree86-xdm-fixes.patch:1.10 Sun Jun 11 19:28:21 2006
+++ SOURCES/XFree86-xdm-fixes.patch Sat Oct 14 22:25:29 2006
@@ -69,9 +69,9 @@
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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/XFree86-xdm-fixes.patch?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
