[PATCH util/macros] Add sed pattern for __xorgconfd__ (xorg.conf.d).
Peter Hutterer
peter.hutterer at who-t.net
Fri Mar 18 14:36:34 PDT 2011
On Fri, Mar 18, 2011 at 10:50:34AM -0400, Gaetan Nadon wrote:
> On Fri, 2011-03-18 at 10:23 +1000, Peter Hutterer wrote:
>
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> > xorg-macros.m4.in | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
> > index 44038e1..1476971 100644
> > --- a/xorg-macros.m4.in
> > +++ b/xorg-macros.m4.in
> > @@ -187,6 +187,7 @@ MAN_SUBSTS="\
> > -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
> > -e 's|__xservername__|Xorg|g' \
> > -e 's|__xconfigfile__|xorg.conf|g' \
> > + -e 's|__xorgconfdir__|xorg.conf.d|g' \
> > -e 's|__projectroot__|\$(prefix)|g' \
> > -e 's|__apploaddir__|\$(appdefaultdir)|g' \
> > -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
>
>
> I ran into this while reworking the server man pages. The value of the
> dir is hard coded:
>
> XF86CONFIGDIR="xorg.conf.d"
>
> In the manpages.am xserver manpages.am:
>
> -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
>
> I would prefer not adding cruft, even if it completes a pattern.
> Once in there, it will have to remain there forever.
>
> You did not mention where this pattern would be used. I searched all man pages
> and could not find any xorg.conf.d. Would that be for new text?
yeah, updating some of the driver man pages to point to xorg.conf.d. I
remember writing at least one of them, so I think one driver (wacom maybe?)
should already have some mention. or not, can't remember if that got pushed
:)
Cheers,
Peter
More information about the xorg-devel
mailing list