Man page updates

 - use normal Xorg rules for substituting package/system variables
 - fix typos
 - correct default libX11 compose cache path
 - remove Makefile recursion

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

4 files changed, 32 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index c9c2ccd..7b48ec0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,18 @@
-SUBDIRS = doc
-
 AM_CFLAGS = @XLIB_CFLAGS@ $(CWARNFLAGS)
 
 sbin_PROGRAMS = mkcomposecache
-EXTRA_DIST = ChangeLog mkallcomposecaches.sh
+
+adminmandir = $(ADMIN_MAN_DIR)
+adminman_PRE = mkcomposecache.man
+adminman_DATA = $(adminman_PRE:man=@ADMIN_MAN_SUFFIX@)
+
+EXTRA_DIST = ChangeLog mkallcomposecaches.sh $(adminman_PRE)
 
 mkcomposecache_SOURCES = mkcomposecache.c
 
 mkcomposecache_LDADD = @XLIB_LIBS@
 
-CLEANFILES=ChangeLog
+CLEANFILES = $(adminman_DATA)
 MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in depcomp install-sh missing ChangeLog
 
 .PHONY: ChangeLog
@@ -18,3 +21,23 @@ ChangeLog:
 
 dist-hook: ChangeLog
 
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__apploaddir__|$(appdefaultdir)|' \
+	-e 's|__adminmansuffix__|$(ADMIN_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 = .$(ADMIN_MAN_SUFFIX) .man
+
+.man.$(ADMIN_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/configure.ac b/configure.ac
index 28238ab..412e557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,4 +25,4 @@ AC_CHECK_FUNCS([unsetenv])
 AC_SUBST(XLIB_CFLAGS)
 AC_SUBST(XLIB_LIBS)
 
-AC_OUTPUT([Makefile doc/Makefile])
+AC_OUTPUT([Makefile])
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 597a294..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = $(man_MANS)
-man_MANS = mkcomposecache.8
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/doc/mkcomposecache.8 b/mkcomposecache.man
index 21d01af..e774fff 100644
--- a/doc/mkcomposecache.8
+++ b/mkcomposecache.man
@@ -1,7 +1,7 @@
-.TH MKCOMPOSECACHE 1 "mkcomposecache 1.0" "X Version 11"
+.TH MKCOMPOSECACHE __adminmansuffix__ __xorgversion__
 
 .SH NAME
-mkcomposecache \- create a cache file for a compose file explicitely
+mkcomposecache \- create a cache file for a compose file explicitly
 
 .SH SYNOPSIS
 .B "mkcomposecache"
@@ -22,7 +22,7 @@ and saves it in
 .IR cache-dir .
 If
 .I internal-name
-has been spezified, it is used as the name of the compose table for computing
+has been specified, it is used as the name of the compose table for computing
 the hash values and internal validation. This is necessary if global compose
 cache files shall be created while using
 .I DESTDIR
@@ -60,7 +60,7 @@ en_US.UTF-8
 /usr/share/X11/locale/en_US.UTF-8/Compose
 
 .SH FILES
-.B /var/X11R6/compose_cache
+.B /var/cache/libx11/compose/
 Location of global compose cache.
 
 .SH AUTHOR