config: move man pages into their own directory

Use services provided by XORG_MANPAGE_SECTIONS.
Use standard Makefile for man pages.

Change-Id: I37bbf3ce0ad721eefb65f84b412ce344c47377c2
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 311425b..497be4a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xwd
 
 AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS)
@@ -36,24 +37,7 @@ xwd_SOURCES =        \
         wsutils.h \
         xwd.c
 
-appman_PRE = \
-        xwd.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-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) < $< > $@
-
 
 .PHONY: ChangeLog INSTALL
 

diff --git a/configure.ac b/configure.ac
index ddd1466..ceda069 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XWD, x11)
 
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+       Makefile
+       man/Makefile])
+AC_OUTPUT

diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644 (file)
index 0000000..d7fea8f
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xwd.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+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/xwd.man b/man/xwd.man
similarity index 100%
rename from xwd.man
rename to man/xwd.man