summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-08-17 08:39:22 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-08-17 08:39:22 -0400
commitc8bbca66bc1cf75ca01c66901605549dc780def6 (patch)
tree167a10a1721df0eeb359bfc5c008c455cedb920a
parentb4975daf8c85eda619da1cb6f1584876786feaaa (diff)
downloadxorg-lib-libXRes-c8bbca66bc1cf75ca01c66901605549dc780def6.tar.gz
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.am32
-rw-r--r--man/XResQueryClientPixmapBytes.man1
-rw-r--r--man/XResQueryClientResources.man1
-rw-r--r--man/XResQueryClients.man1
-rw-r--r--man/XResQueryExtension.man1
-rw-r--r--man/XResQueryVersion.man1
6 files changed, 16 insertions, 21 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index c1ca1b8..8608437 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,34 +23,24 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+libman_PRE = \
+ XRes.man \
+ $(XRes_shadows:=.man)
-libman_PRE = XRes.man
+XRes_shadows = \
+ XResQueryExtension \
+ XResQueryVersion \
+ XResQueryClients \
+ XResQueryClientResources \
+ XResQueryClientPixmapBytes
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XRes_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)
-
-XRes_shadows = \
- XResQueryExtension \
- XResQueryVersion \
- XResQueryClients \
- XResQueryClientResources \
- XResQueryClientPixmapBytes
-
-XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
-
-$(XRes_shadowmen):
- $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@
-
diff --git a/man/XResQueryClientPixmapBytes.man b/man/XResQueryClientPixmapBytes.man
new file mode 100644
index 0000000..10d7bd3
--- /dev/null
+++ b/man/XResQueryClientPixmapBytes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__libmansuffix__
diff --git a/man/XResQueryClientResources.man b/man/XResQueryClientResources.man
new file mode 100644
index 0000000..10d7bd3
--- /dev/null
+++ b/man/XResQueryClientResources.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__libmansuffix__
diff --git a/man/XResQueryClients.man b/man/XResQueryClients.man
new file mode 100644
index 0000000..10d7bd3
--- /dev/null
+++ b/man/XResQueryClients.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__libmansuffix__
diff --git a/man/XResQueryExtension.man b/man/XResQueryExtension.man
new file mode 100644
index 0000000..10d7bd3
--- /dev/null
+++ b/man/XResQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__libmansuffix__
diff --git a/man/XResQueryVersion.man b/man/XResQueryVersion.man
new file mode 100644
index 0000000..10d7bd3
--- /dev/null
+++ b/man/XResQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__libmansuffix__