diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-04 21:27:24 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-04 21:42:39 -0700 |
| commit | 7abbe73c0ead0f335f2e39a486ac3004b8c30b08 (patch) | |
| tree | 96f2a9ff4b8815a55e0a1ab7056d667482306805 | |
| parent | 7718a63128381dc22021e9a7bee5a477771d1be0 (diff) | |
config: use util-macros 1.8 for man page substitutions
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Use $(CHANGELOG_CMD) provided by XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 7 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index da9497a..3854465 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,26 +45,18 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) CLEANFILES = $(appman_DATA) gccmakedep gccmdep -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' - SUFFIXES += .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = $(appman_PRE) gccmdep.cpp -EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index a0e912a..1ad21cd 100644 --- a/configure.ac +++ b/configure.ac @@ -31,13 +31,13 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL -AC_PROG_CC +# Require 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.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS XORG_PROG_RAWCPP -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_CONFIG_FILES([Makefile]) AC_OUTPUT |