On Fri, Mar 13, 2009 at 08:06:55AM +0000, Iain Hibbert wrote:
> On Thu, 12 Mar 2009, Iain Hibbert wrote:
>
> > On Wed, 11 Mar 2009, Toru Nishimura wrote:
> >
> > > Index: external/mit/xorg/bin/xdm/config/Makefile
> > > ===================================================================
> > > RCS file: /cvsroot/src/external/mit/xorg/bin/xdm/config/Makefile,v
> > > retrieving revision 1.6
> > > diff -c -r1.6 Makefile
> > > *** external/mit/xorg/bin/xdm/config/Makefile 14 Feb 2009 13:32:12 -0000
> > > 1.6
> > > --- external/mit/xorg/bin/xdm/config/Makefile 11 Mar 2009 07:12:47 -0000
> > > ***************
> > > *** 25,31 ****
> > > -DXPM \
> > > -DSU="su -m"
> > > ! CONFIGFILES= GiveConsole TakeConsole \
> > > Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
> > > ${CPPSCRIPTS}
> > > --- 25,31 ----
> > > -DXPM \
> > > -DSU="su -m"
> > > ! CONFIGFILES= GiveConsole TakeConsole Xstartup Xreset \
> > > Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
> > > ${CPPSCRIPTS}
> >
> > I think you need to add these files to CPPSCRIPTS variable instead as they
> > are not represented directly and need to be passed through cpp..?
>
> btw I tried that also (patch below) and there is an error in the Xorg
> source files, the Xstartup.cpp and Xreset.cpp files both contain the
> following
>
>
> XCOMM!/bin/sh
> XCOMM Deregister a login. (Derived from TakeConsole as follows:)
> XCOMM
> BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
> -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
>
>
> where the Makefile is supposed to be replacing XDMCONFIGDIR but it cannot
> because cpp doesn't find tokens inside quotes. Perhaps the quote marks
> need removing also? I didn't check if they fixed that in latest Xorg
> sources..
They probably use sed in the X.Org sources... We should use it too.
--
Quentin Garnier - cube%cubidou.net@localhost - cube%NetBSD.org@localhost
"See the look on my face from staying too long in one place
[...] every time the morning breaks I know I'm closer to falling"
KT Tunstall, Saving My Face, Drastic Fantastic, 2007.
Attachment:
pgpAteynatEa8.pgp
Description: PGP signature