Gaetan Nadon wrote: > It will replace the 155 copies in package makefiles > > Signed-off-by: Gaetan Nadon <[email protected]> > --- > xorg-macros.m4.in | 18 ++++++++++++++++++ > 1 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in > index 5e89dd1..eccea2a 100644 > --- a/xorg-macros.m4.in > +++ b/xorg-macros.m4.in > @@ -105,6 +105,7 @@ AC_SUBST(RAWCPPFLAGS) > # on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. > # Not sure if there's any better way than just hardcoding by OS name. > # Override default settings by setting environment variables > +# Added MAN_SUBSTS in version 1.8 > > AC_DEFUN([XORG_MANPAGE_SECTIONS],[ > AC_REQUIRE([AC_CANONICAL_HOST]) > @@ -176,6 +177,23 @@ AC_SUBST([FILE_MAN_DIR]) > AC_SUBST([MISC_MAN_DIR]) > AC_SUBST([DRIVER_MAN_DIR]) > AC_SUBST([ADMIN_MAN_DIR]) > + > +XORG_MAN_PAGE="X Version 11" > +AC_SUBST([XORG_MAN_PAGE]) > +MAN_SUBSTS="\ > + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ > + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ > + -e 's|__xservername__|Xorg|g' \ > + -e 's|__xconfigfile__|xorg.conf|g' \ > + -e 's|__projectroot__|\$(prefix)|g' \ > + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ > + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ > + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ > + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ > + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ > + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" > +AC_SUBST([MAN_SUBSTS]) > + > ]) # XORG_MANPAGE_SECTIONS > > # XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
Reviewed-by: Alan Coopersmith <[email protected]> There is one module I know of that doesn't hardcode servername/xconfigfile: app/xinit, which substitutes XWin/XWinrc on cygwin, Xquartz/defaults on darwin, and Xorg/xorg.conf everywhere else. That can continue to be a special case though, since most of the modules that even use those macros are the Xorg-specific drivers. -- -Alan Coopersmith- [email protected] Oracle Solaris Platform Engineering: X Window System _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
