man: store shadow man pages in git rather than generating them

Simplify the build process and the makefile.

Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba

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

man/Makefile.am

 libmandir = $(LIB_MAN_DIR)
 
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
 libman_xml = Xcomposite.xml
 
-libman_PRE = $(libman_xml:xml=man)
+libman_PRE = $(libman_xml:xml=man)		\
+	     $(Xcomposite_shadows:=.man)
 
-Xcomposite_man_aliases = 			\
+Xcomposite_shadows =	 			\
 	XCompositeQueryExtension		\
 	XCompositeQueryVersion			\
 	XCompositeVersion			\
@@ -19,22 +18,16 @@ Xcomposite_man_aliases = 			\
 	XCompositeGetOverlayWindow		\
 	XCompositeReleaseOverlayWindow
 
-Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
-
 if INSTALL_MANPAGES
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xcomposite_shadowmen)
+	      $(Xcomposite_shadows:=.@LIB_MAN_SUFFIX@)
 endif
 
 EXTRA_DIST  = $(libman_PRE) $(libman_xml)
 
 CLEANFILES  = $(libman_DATA)
 
-MAINTAINERCLEANFILES = $(libman_PRE)
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-$(Xcomposite_shadowmen):
-	$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
+MAINTAINERCLEANFILES = $(libman_xml:xml=man)
 
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
 

man/XCompositeCreateRegionFromBorderClip.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeGetOverlayWindow.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeNameWindowPixmap.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeQueryExtension.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeQueryVersion.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeRedirectSubwindows.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeRedirectWindow.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeReleaseOverlayWindow.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeUnredirectSubwindows.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeUnredirectWindow.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__

man/XCompositeVersion.man

+.so man__libmansuffix__/Xcomposite.__libmansuffix__