Enable manpage sections to be automatically set. (cf. Debian bug #384766)

5 files changed, 137 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index d924b03..833ed33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ fi
 
 PKG_CHECK_MODULES(XPXTHELLOWORLD, xaw8 xprintutil xt xp)
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([
diff --git a/xphelloworld/Makefile.am b/xphelloworld/Makefile.am
index 2a9b0be..c867100 100644
--- a/xphelloworld/Makefile.am
+++ b/xphelloworld/Makefile.am
@@ -27,7 +27,39 @@ xphelloworld_LDADD = $(XPHELLOWORLD_LIBS)
 xphelloworld_SOURCES =	\
         xphelloworld.c
 
-dist_man1_MANS = \
+appman_PRE = \
         xphelloworld.man
 
-EXTRA_DIST = xphelloworld.sgml
+EXTRA_DIST = \
+	xphelloworld.sgml
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST += $(appman_PRE)
+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
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/xpsimplehelloworld/Makefile.am b/xpsimplehelloworld/Makefile.am
index b62f14f..5ab7d74 100644
--- a/xpsimplehelloworld/Makefile.am
+++ b/xpsimplehelloworld/Makefile.am
@@ -27,7 +27,39 @@ xpsimplehelloworld_LDADD = $(XPSIMPLEHELLOWORLD_LIBS)
 xpsimplehelloworld_SOURCES =	\
         xpsimplehelloworld.c
 
-dist_man1_MANS = \
+appman_PRE = \
         xpsimplehelloworld.man
 
-EXTRA_DIST = xpsimplehelloworld.sgml
+EXTRA_DIST = \
+	xpsimplehelloworld.sgml
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST += $(appman_PRE)
+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
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/xpxmhelloworld/Makefile.am b/xpxmhelloworld/Makefile.am
index 4e84dee..9ebce4c 100644
--- a/xpxmhelloworld/Makefile.am
+++ b/xpxmhelloworld/Makefile.am
@@ -27,7 +27,39 @@ xpxmhelloworld_LDADD = $(XPXMHELLOWORLD_LIBS)
 xpxmhelloworld_SOURCES =	\
         xpxmhelloworld.c
 
-dist_man1_MANS = \
+appman_PRE = \
         xpxmhelloworld.man
 
-EXTRA_DIST = xpxmhelloworld.sgml
+EXTRA_DIST = \
+	xpxmhelloworld.sgml
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST += $(appman_PRE)
+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
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/xpxthelloworld/Makefile.am b/xpxthelloworld/Makefile.am
index 9f0a4a7..96cb65f 100644
--- a/xpxthelloworld/Makefile.am
+++ b/xpxthelloworld/Makefile.am
@@ -27,7 +27,39 @@ xpxthelloworld_LDADD = $(XPXTHELLOWORLD_LIBS)
 xpxthelloworld_SOURCES =	\
         xpxthelloworld.c
 
-dist_man1_MANS = \
+appman_PRE = \
         xpxthelloworld.man
 
-EXTRA_DIST = xpxthelloworld.sgml
+EXTRA_DIST = \
+	xpxthelloworld.sgml
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST += $(appman_PRE)
+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
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@