summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-08-20 09:27:12 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-08-20 09:33:10 -0400
commite8d3097d42969fa1e32eff2ece252ff584d3d56a (patch)
tree237eb2fe0ab5d9c47d0d3a20c74fcc6e32b0f0cc /Makefile.am
parentd310e0321f888bf2fc215587457722a73b0f127a (diff)
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 Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am26
1 files changed, 3 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index 5fa1514..48561ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = bdftruncate ucs2any
AM_CFLAGS = $(CWARNFLAGS)
@@ -52,33 +53,12 @@ mapfiles_DATA = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontutil.pc
-appmandir = $(APP_MAN_DIR)
-appman_PRE = bdftruncate.man ucs2any.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+CLEANFILES = bdftruncate
-CLEANFILES = bdftruncate $(appman_DATA)
-
-EXTRA_DIST = $(mapfiles_DATA) $(appman_PRE)
+EXTRA_DIST = $(mapfiles_DATA)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-SED = sed
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__mapfilesdir__|$(mapfilesdir)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g'
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-
.PHONY: ChangeLog INSTALL
INSTALL: