summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-08-16 20:06:56 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-08-16 20:30:53 -0400
commitc09ed03c45c8141b620a49bce2dc19a2729b60b8 (patch)
tree811a76a83d6210199ccd1685af46e2a0f14870c6
parentade2b02753362b178d7e926e18601ae2b0698532 (diff)
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>
-rw-r--r--man/Makefile.am33
-rw-r--r--man/XineramaIsActive.man1
-rw-r--r--man/XineramaQueryExtension.man1
-rw-r--r--man/XineramaQueryScreens.man1
-rw-r--r--man/XineramaQueryVersion.man1
5 files changed, 16 insertions, 21 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index 73078f8..3a3285f 100644
--- a/man/Makefile.am
+++ b/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/man/XineramaIsActive.man b/man/XineramaIsActive.man
new file mode 100644
index 0000000..bf86f34
--- /dev/null
+++ b/man/XineramaIsActive.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/man/XineramaQueryExtension.man b/man/XineramaQueryExtension.man
new file mode 100644
index 0000000..bf86f34
--- /dev/null
+++ b/man/XineramaQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/man/XineramaQueryScreens.man b/man/XineramaQueryScreens.man
new file mode 100644
index 0000000..bf86f34
--- /dev/null
+++ b/man/XineramaQueryScreens.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
diff --git a/man/XineramaQueryVersion.man b/man/XineramaQueryVersion.man
new file mode 100644
index 0000000..bf86f34
--- /dev/null
+++ b/man/XineramaQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__