<html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> <div class="moz-cite-prefix">On 14-04-16 10:57 AM, Hans de Goede wrote: </div> <blockquote cite="mid:534E9A63.7090906@redhat.com" type="cite"> <pre wrap="">Hi All, In hw/xfree86/man/Makefile.am we now have: include $(top_srcdir)/manpages.am appman_PRE = Xorg.man fileman_PRE = xorg.conf.man xorg.conf.d.man if SUID_WRAPPER appman_PRE += Xorg.wrap.man fileman_PRE += Xwrapper.config.man endif And in manpages.am: EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE) Normally automake automatically includes build-deps in "make dist" even if they are in a if ... endif block. But in this case since we conditionally modify a variable and then use that in EXTRA_DIST it seems that make dist is not including Xorg.wrap.man and Xwrapper.config.man (as can been seen in the xorg-server-1.15.99.902 tarbals). Any suggestions on how to fix this in a clean way ?</pre> </blockquote> <blockquote><tt>diff --git a/hw/xfree86/man/Makefile.am b/hw/xfree86/man/Makefile.am</tt><tt> </tt><tt>index f41d26c..5da404c 100644</tt><tt> </tt><tt>--- a/hw/xfree86/man/Makefile.am</tt><tt> </tt><tt>+++ b/hw/xfree86/man/Makefile.am</tt><tt> </tt><tt>@@ -5,4 +5,6 @@ fileman_PRE = xorg.conf.man xorg.conf.d.man</tt><tt> </tt><tt> if SUID_WRAPPER</tt><tt> </tt><tt> appman_PRE += Xorg.wrap.man</tt><tt> </tt><tt> fileman_PRE += Xwrapper.config.man</tt><tt> </tt><tt>+else</tt><tt> </tt><tt>+EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man</tt><tt> </tt><tt> endif</tt><tt> </tt></blockquote> In manpages.am: <blockquote><tt># The calling Makefile should only contain man page targets</tt><tt> </tt><tt># Otherwise the following three global variables may conflict</tt><tt> </tt><tt>EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE)</tt><tt> </tt><tt>CLEANFILES = $(appman_DATA) $(driverman_DATA) $(fileman_DATA)</tt><tt> </tt><tt>SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man</tt><tt> </tt></blockquote> We need to explicitly list files in EXTRA_DIST. We cannot use the built-in rules for man pages as they assume a hard-coded suffix (like .1 and so on). There is a problem in the content of the man page where the suffix is hard-coded. <blockquote><tt>.TH Xorg.wrap 1 __xorgversion__</tt> </blockquote> should be: <blockquote><tt>.TH Xorg.wrap __appmansuffix__ __xorgversion__</tt> </blockquote> as it is for Xorg.man Xwrapper.config goes in the file section (usually 5, but not always). It should be: <blockquote><tt>.so man__appmansuffix__/Xwrapper.config.__appmansuffix__</tt> </blockquote> We have a man page for a "file" that is pointing to a man page for an "application". I am aware that section #1 is the same for all platforms, but it is the only one. All sections have been assigned a variable to have a common design which helps preventing other sections from being hard-coded. You can have a look at libXi for extensive use of .so man pages. Please double-check everything, it is error-prone. <blockquote cite="mid:534E9A63.7090906@redhat.com" type="cite"> <pre wrap=""> Regards, Hans _______________________________________________ <a class="moz-txt-link-abbreviated" href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development Archives: <a class="moz-txt-link-freetext" href="http://lists.x.org/archives/xorg-devel">http://lists.x.org/archives/xorg-devel</a> Info: <a class="moz-txt-link-freetext" href="http://lists.x.org/mailman/listinfo/xorg-devel">http://lists.x.org/mailman/listinfo/xorg-devel</a> </pre> </blockquote> </body> </html>