Man pages still showing version 1.0 in the 1.1 release

The patch coverts the man subdir to the standard xorg man page makefile.
The version number is automatically updated when a new release is made.
The man page section number is no longer hard coded either.

The package util-macros at version 1.8 or greater is required.

Acked-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

configure.ac

@@ -97,8 +97,10 @@ if test "x$SHADER_DEBUGGER" = xyes; then
 	fi
 fi
 
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# 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.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 AC_CONFIG_FILES([

man/.gitignore

@@ -1 +0,0 @@
-!*.1

man/Makefile.am

@@ -1,16 +1,28 @@
-dist_man1_MANS = \
-	intel_audio_dump.1 \
-	intel_bios_dumper.1 \
-	intel_bios_reader.1 \
-	intel_error_decode.1 \
-	intel_gpu_top.1 \
-	intel_gtt.1 \
-	intel_lid.1 \
-	intel_reg_dumper.1 \
-	intel_reg_read.1 \
-	intel_reg_write.1 \
-	intel_stepping.1 \
-	intel_upload_blit_large.1 \
-	intel_upload_blit_large_gtt.1 \
-	intel_upload_blit_large_map.1 \
-	intel_upload_blit_small.1
+appmandir = $(APP_MAN_DIR)
+appman_PRE = 				\
+	intel_audio_dump.man		\
+	intel_bios_dumper.man		\
+	intel_bios_reader.man		\
+	intel_error_decode.man		\
+	intel_gpu_top.man		\
+	intel_gtt.man			\
+	intel_lid.man			\
+	intel_reg_dumper.man		\
+	intel_reg_read.man		\
+	intel_reg_write.man		\
+	intel_stepping.man		\
+	intel_upload_blit_large.man	\
+	intel_upload_blit_large_gtt.man \
+	intel_upload_blit_large_map.man \
+	intel_upload_blit_small.man
+
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

man/intel_audio_dump.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_audio_dump 1 "intel_audio_dump 1.0"
+.TH intel_audio_dump __appmansuffix__ __xorgversion__
 .SH NAME
 intel_audio_dump \- Dumps the Intel GPU registers for HDMI audio setup.
 .SH SYNOPSIS

man/intel_bios_dumper.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_bios_dumper 1 "intel_bios_dumper 1.0"
+.TH intel_bios_dumper __appmansuffix__ __xorgversion__
 .SH NAME
 intel_bios_dumper \- Saves the Intel video BIOS contents to a file.
 .SH SYNOPSIS

man/intel_bios_reader.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_bios_reader 1 "intel_bios_dumper 1.0"
+.TH intel_bios_reader __appmansuffix__ __xorgversion__
 .SH NAME
 intel_bios_reader \- Parses an Intel BIOS and displays many of its tables
 .SH SYNOPSIS

man/intel_error_decode.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_error_decode 1 "intel_error_decode 1.0"
+.TH intel_error_decode __appmansuffix__ __xorgversion__
 .SH NAME
 intel_error_decode \- Decodes an Intel GPU dump automatically captured by the kernel at the time of an error.
 .SH SYNOPSIS

man/intel_gpu_top.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_gpu_top 1 "intel_gpu_top 1.0"
+.TH intel_gpu_top __appmansuffix__ __xorgversion__
 .SH NAME
 intel_gpu_top \- Display a top-like summary of Intel GPU usage
 .SH SYNOPSIS

man/intel_gtt.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_gtt 1 "intel_gtt 1.0"
+.TH intel_gtt __appmansuffix__ __xorgversion__
 .SH NAME
 intel_gtt \- Dump the contents of an Intel GPU's GTT
 .SH SYNOPSIS

man/intel_lid.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_lid 1 "intel_lid 1.0"
+.TH intel_lid __appmansuffix__ __xorgversion__
 .SH NAME
 intel_ \- Polls the values of different reports about laptop lid state.
 .SH SYNOPSIS

man/intel_reg_dumper.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_reg_dumper 1 "intel_reg_dumper 1.0"
+.TH intel_reg_dumper __appmansuffix__ __xorgversion__
 .SH NAME
 intel_reg_dumper \- Decode a bunch of Intel GPU registers for debugging
 .SH SYNOPSIS

man/intel_reg_read.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_reg_read 1 "intel_reg_read 1.0"
+.TH intel_reg_read __appmansuffix__ __xorgversion__
 .SH NAME
 intel_reg_read \- Reads an Intel GPU register value
 .SH SYNOPSIS

man/intel_reg_snapshot.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_reg_snapshot 1 "intel_reg_snapshot 1.0"
+.TH intel_reg_snapshot __appmansuffix__ __xorgversion__
 .SH NAME
 intel_reg_snapshot \- Take a GPU register snapshot
 .SH SYNOPSIS

man/intel_reg_write.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_reg_write 1 "intel_reg_write 1.0"
+.TH intel_reg_write __appmansuffix__ __xorgversion__
 .SH NAME
 intel_reg_write \- Set an Intel GPU register to a value
 .SH SYNOPSIS

man/intel_stepping.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_stepping 1 "intel_stepping 1.0"
+.TH intel_stepping __appmansuffix__ __xorgversion__
 .SH NAME
 intel_stepping \- Display the stepping information for an Intel GPU
 .SH SYNOPSIS

man/intel_upload_blit_large.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_upload_blit_large 1 "intel_upload_blit_large 1.0"
+.TH intel_upload_blit_large __appmansuffix__ __xorgversion__
 .SH NAME
 intel_upload_blit_large \- microbenchmark of Intel GPU performance
 .SH SYNOPSIS

man/intel_upload_blit_large_gtt.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_upload_blit_large_gtt 1 "intel_upload_blit_large_gtt 1.0"
+.TH intel_upload_blit_large_gtt __appmansuffix__ __xorgversion__
 .SH NAME
 intel_upload_blit_large_gtt \- microbenchmark of Intel GPU performance
 .SH SYNOPSIS

man/intel_upload_blit_large_map.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_upload_blit_large_map 1 "intel_upload_blit_large_map 1.0"
+.TH intel_upload_blit_large_map __appmansuffix__ __xorgversion__
 .SH NAME
 intel_upload_blit_large_map \- microbenchmark of Intel GPU performance
 .SH SYNOPSIS

man/intel_upload_blit_small.man

@@ -1,6 +1,6 @@
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
-.TH intel_upload_blit_small 1 "intel_upload_blit_small 1.0"
+.TH intel_upload_blit_small __appmansuffix__ __xorgversion__
 .SH NAME
 intel_upload_blit_small \- microbenchmark of Intel GPU performance
 .SH SYNOPSIS