5 files changed, 16 insertions, 21 deletions
diff --git a/libXinerama/man/Makefile.am b/libXinerama/man/Makefile.am
index 7d8cc3dec..312a14b93 100644
--- a/libXinerama/man/Makefile.am
+++ b/libXinerama/man/Makefile.am
@@ -23,32 +23,23 @@
 
 libmandir = $(LIB_MAN_DIR)
 
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libman_PRE = Xinerama.man
-
-BUILT_SOURCES = $(Xinerama_shadowmen)
+libman_PRE =				\
+	Xinerama.man			\
+	$(Xinerama_shadows:=.man)
+
+Xinerama_shadows =			\
+	XineramaQueryExtension		\
+	XineramaQueryVersion		\
+	XineramaIsActive		\
+	XineramaQueryScreens
 
 EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
 
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xinerama_shadowmen)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
 
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(LIB_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xinerama_shadows =		\
-	XineramaQueryExtension	\
-	XineramaQueryVersion	\
-	XineramaIsActive	\
-	XineramaQueryScreens
-
-Xinerama_shadowmen = $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xinerama_shadowmen):
-	$(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xinerama.$(LIB_MAN_SUFFIX)" > $@
diff --git a/libXinerama/man/XineramaIsActive.man b/libXinerama/man/XineramaIsActive.man
new file mode 100644
index 000000000..a4f83321b
--- /dev/null
+++ b/libXinerama/man/XineramaIsActive.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryExtension.man b/libXinerama/man/XineramaQueryExtension.man
new file mode 100644
index 000000000..a4f83321b
--- /dev/null
+++ b/libXinerama/man/XineramaQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryScreens.man b/libXinerama/man/XineramaQueryScreens.man
new file mode 100644
index 000000000..a4f83321b
--- /dev/null
+++ b/libXinerama/man/XineramaQueryScreens.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/libXinerama/man/XineramaQueryVersion.man b/libXinerama/man/XineramaQueryVersion.man
new file mode 100644
index 000000000..a4f83321b
--- /dev/null
+++ b/libXinerama/man/XineramaQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__