summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-09-24 03:10:43 (GMT)
committerSung-Jin Park <sj76.park@samsung.com>2013-09-03 03:32:30 (GMT)
commit96bdb8ec8c749f7df201d982785666dbb00f1e98 (patch)
treeb2489861d8f736a3d271865d22a61983a48f9c4c
parentb005314e186ea168f8a247a6401f32345138a276 (diff)
downloadxev-96bdb8ec8c749f7df201d982785666dbb00f1e98.zip
xev-96bdb8ec8c749f7df201d982785666dbb00f1e98.tar.gz
xev-96bdb8ec8c749f7df201d982785666dbb00f1e98.tar.bz2
config: upgrade to util-macros 1.8 for additional man page supportrefs/changes/90/9190/1
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: I1217dab96d02c88f82bb3cce87378afa40290c83 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am20
-rw-r--r--configure.ac6
2 files changed, 4 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am
index e862b5e..26ba697 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,27 +39,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 2146dff..8a0ffbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros 1.3 or later: 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)
AC_PROG_CC
AC_PROG_INSTALL