diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-08 23:31:22 -0800 |
|---|---|---|
| committer | Sung-Jin Park <sj76.park@samsung.com> | 2013-09-02 23:38:16 -0400 |
| commit | 71a99902e8f74d46bc7745c5dc015c427ca43b95 (patch) | |
| tree | ed679b96a176cda5ed14a4338a529a66db6b30a6 | |
| parent | c0b37d01d7370603cccc82fcb70e58ad7e5f5937 (diff) | |
| download | xeyes-71a99902e8f74d46bc7745c5dc015c427ca43b95.tar.gz xeyes-71a99902e8f74d46bc7745c5dc015c427ca43b95.tar.bz2 xeyes-71a99902e8f74d46bc7745c5dc015c427ca43b95.zip | |
config: upgrade to util-macros 1.8 for additional man page support
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
Enables use of platform appropriate version of sed.
Change-Id: I71c92d9a4d87f8f48ff8564f77642ca7c8f10bf4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 0286e1c..9b66ea5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,27 +45,9 @@ EXTRA_DIST += $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# 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|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_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 = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 25174c8..d98b698 100644 --- a/configure.ac +++ b/configure.ac @@ -28,10 +28,10 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# 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.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_PROG_CC |