summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-02-12 18:19:23 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-02-12 18:19:23 +0000
commit789ff24df047508e04a40fd4b9605e6f40f86638 (patch)
tree5451a1042fd61faf3b7119b55b91f252f5b8f8d0
parent6455000546cf8fd14f165a4f13590f94fc9948dc (diff)
Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> Shadow pagesXORG-7_0_99_901
not created correctly when MANDIR & MANSUFFIX don't match.
-rw-r--r--ChangeLog6
-rw-r--r--man/Makefile.am4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 84819b4..f1e0a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * man/Makefile.am:
+ Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
+ Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 1bcfc86..b2eae41 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,6 +27,8 @@
libmandir = $(LIB_MAN_DIR)
+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+
libman_PRE = XF86VM.man
BUILT_SOURCES = shadows.DONE
@@ -85,5 +87,5 @@ XF86VM_shadows = \
shadows.DONE:
-rm -f $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
(for i in $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX) > $$i; \
+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX) > $$i; \
done)