On Fri, Jun 11, 2010 at 11:49:38AM -0400, Gaetan Nadon wrote: > Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS > The value of MAN_SUBST is the same for all X.Org packages. > > Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS > The existing statement can now be removed from the configuration file. > > Use Automake $() for variables in Makefile.am > > Signed-off-by: Gaetan Nadon <[email protected]> > ---
both applied, thanks. > configure.ac | 7 +++---- > man/Makefile.am | 23 ++++------------------- > 2 files changed, 7 insertions(+), 23 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 648804a..aa7ba18 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -38,15 +38,14 @@ AM_MAINTAINER_MODE > AC_DISABLE_STATIC > AC_PROG_LIBTOOL > > -# Initialize X.Org macros > +# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by > XORG_MANPAGE_SECTIONS > m4_ifndef([XORG_MACROS_VERSION], > - [m4_fatal([must install xorg-macros 1.4 or later before running > autoconf/autogen])]) > -XORG_MACROS_VERSION(1.4) > + [m4_fatal([must install xorg-macros 1.8 or later before running > autoconf/autogen])]) > +XORG_MACROS_VERSION(1.8) > XORG_DEFAULT_OPTIONS > > # Checks for programs. > AC_PROG_INSTALL > -AC_PROG_SED > > # Obtain compiler/linker options from server and required extensions > PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto) > diff --git a/man/Makefile.am b/man/Makefile.am > index 4edafaa..0a7311e 100644 > --- a/man/Makefile.am > +++ b/man/Makefile.am > @@ -22,31 +22,16 @@ > > drivermandir = $(DRIVER_MAN_DIR) > > -driverman_PRE = @[email protected] > +driverman_PRE = $(DRIVER_NAME).man > > -driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@) > +driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX)) > > -EXTRA_DIST = @[email protected] > +EXTRA_DIST = $(DRIVER_NAME).man > > CLEANFILES = $(driverman_DATA) > > -# Strings to replace in man pages > -XORGRELSTRING = @PACKAGE_STRING@ > - XORGMANNAME = X Version 11 > - > -MAN_SUBSTS = \ > - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ > - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ > - -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|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ > - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' > - > SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man > > +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via > configure > .man.$(DRIVER_MAN_SUFFIX): > $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ > -- > 1.6.0.4 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
