1 files changed, 30 insertions, 32 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index 69742403..e40e2e93 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,41 +1,39 @@
 appmandir = $(APP_MAN_DIR)
-appman_PRE = 				\
-	intel_aubdump.man		\
-	intel_audio_dump.man		\
-	intel_bios_dumper.man		\
-	intel_bios_reader.man		\
-	intel_error_decode.man		\
-	intel_gpu_frequency.man		\
-	intel_gpu_top.man		\
-	intel_gtt.man			\
-	intel_infoframes.man		\
-	intel_lid.man			\
-	intel_panel_fitter.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))
-
-# man pages in rst, only used if we have rst2man
-appman_RST =				\
-	intel_reg.rst
+appman_RST = 				\
+	intel_aubdump.rst		\
+	intel_audio_dump.rst		\
+	intel_bios_dumper.rst		\
+	intel_bios_reader.rst		\
+	intel_error_decode.rst		\
+	intel_gpu_frequency.rst		\
+	intel_gpu_top.rst		\
+	intel_gtt.rst			\
+	intel_infoframes.rst		\
+	intel_lid.rst			\
+	intel_panel_fitter.rst		\
+	intel_reg.rst			\
+	intel_stepping.rst		\
+	intel_upload_blit_large.rst	\
+	intel_upload_blit_large_gtt.rst \
+	intel_upload_blit_large_map.rst \
+	intel_upload_blit_small.rst
 
 if HAVE_RST2MAN
-appman_DATA += $(appman_RST:rst=$(APP_MAN_SUFFIX))
+appman_DATA = $(appman_RST:rst=$(APP_MAN_SUFFIX))
 endif
 
-EXTRA_DIST = $(appman_PRE) $(appman_RST)
-CLEANFILES = $(appman_DATA)
+EXTRA_DIST = $(appman_RST)
+CLEANFILES = $(appman_DATA) defs.rst
 
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX)
 
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+# create some definitions useful in the man page rst sources
+defs.rst:
+	$(AM_V_GEN)echo ".. |PACKAGE_NAME| replace:: $(PACKAGE_NAME)" > $@
+	$(AM_V_GEN)echo ".. |PACKAGE_VERSION| replace:: $(PACKAGE_VERSION)" >> $@
+	$(AM_V_GEN)echo ".. |PACKAGE_STRING| replace:: $(PACKAGE_STRING)" >> $@
+	$(AM_V_GEN)echo ".. |MANUAL_SECTION| replace:: 1" >> $@
+	$(AM_V_GEN)echo ".. |MANUAL_GROUP| replace:: General Commands Manual" >> $@
 
-# FIXME: handle MAN_SUBST in rst
-.rst.$(APP_MAN_SUFFIX):
+%.$(APP_MAN_SUFFIX): %.rst defs.rst
 	$(AM_V_GEN)rst2man < $< > $@