<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0"> </HEAD> <BODY> On Tue, 2010-05-25 at 12:49 -0700, Alan Coopersmith wrote: <BLOCKQUOTE TYPE=CITE> <PRE> Gaetan Nadon wrote: > It will replace the 155 copies in package makefiles > > Signed-off-by: Gaetan Nadon <<A HREF="mailto:memsize@videotron.ca">memsize@videotron.ca</A>> > --- > xorg-macros.m4.in | 17 +++++++++++++++++ > 1 files changed, 17 insertions(+), 0 deletions(-) > > diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in > index 5e89dd1..98e3307 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,22 @@ 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" > +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]) The '' should make the $ expansion happen in the Makefile, right? Wouldn't it need to be $() for that case, with AC_SUBST([XORG_MAN_PAGE]) added? </PRE> </BLOCKQUOTE> XORG_MAN_PAGE is not available in the Makefile. It looks like it is expanded very early. This is how it looks in configure: <BLOCKQUOTE> <PRE> XORG_MAN_PAGE="X Version 11" MAN_SUBSTS="\ -e 's|__vendorversion__|\"$PACKAGE_STRING\" \"$XORG_MAN_PAGE\"|' \ </PRE> </BLOCKQUOTE> This is how it looks In config.status: <BLOCKQUOTE> <PRE> S["MAN_SUBSTS"]=" -e 's|__vendorversion__|\"xf86-input-mouse 1.5.0\" \"X Version 11\"|' </PRE> </BLOCKQUOTE> This is how it gets expanded in Makefile: <BLOCKQUOTE> <PRE> MAN_SUBSTS =  -e 's|__vendorversion__|"xf86-input-mouse 1.5.0" "X Version 11"|' </PRE> </BLOCKQUOTE> My limited understanding is that there are several levels of expansions. I know it works, but I cannot explain it and it does not mean it's right. I'd like to find out before mass distribution. Thanks </BODY> </HTML>