summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8e61fe..fcb3e81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * 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/Makefile.am b/Makefile.am
index cd26ed8..e2de3c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,8 @@ xauinclude_HEADERS = include/X11/Xauth.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xau.pc
+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+
libmandir = $(LIB_MAN_DIR)
libman_PRE = Xau.man
BUILT_SOURCES = shadows.DONE
@@ -51,7 +53,7 @@ Xau_shadows = \
shadows.DONE:
-rm -f $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
(for i in $(Xau_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $$i; \
+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $$i; \
done)
XORGRELSTRING = @PACKAGE_STRING@