On Wed, Jun 02, 2010 at 05:21:27PM -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 > > Signed-off-by: Gaetan Nadon <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> for the series. can you send me a pull request for these please. I makes life a tad easier Cheers, Peter > --- > configure.ac | 4 ++-- > man/Makefile.am | 16 ---------------- > 2 files changed, 2 insertions(+), 18 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 22d5760..d84c5d8 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -54,8 +54,8 @@ AC_TYPE_UINT8_T > > # Initialize X.Org macros > 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 > > # Store the list of server defined extensions in REQUIRED_MODULES > diff --git a/man/Makefile.am b/man/Makefile.am > index 7dbc3fa..0f52e67 100644 > --- a/man/Makefile.am > +++ b/man/Makefile.am > @@ -33,22 +33,6 @@ EXTRA_DIST = @[email protected] > > 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 > > .man.$(DRIVER_MAN_SUFFIX): > -- > 1.6.0.4 ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
