summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--man/Makefile.am4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3925f24..e5f9da4 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 121e6e6..140b35b 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 = XDGA.man
BUILT_SOURCES = shadows.DONE
@@ -81,5 +83,5 @@ XDGA_shadows = XF86DGA XFree86-DGA $(DGAFUNCS)
shadows.DONE:
-rm -f $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
(for i in $(XDGA_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_SUFFIX)/XDGA.$(LIB_MAN_SUFFIX) > $$i; \
+ echo .so man$(LIB_MAN_DIR_SUFFIX)/XDGA.$(LIB_MAN_SUFFIX) > $$i; \
done)