# HG changeset patch # User Alan Coopersmith # Date 1316814986 25200 # Node ID 924b7feb31b8ce1ff221bccfcbb5e79e83a30add # Parent 66778b3a7858d894da0239170ae0de87b3d4ff60 7091272 Missing reference of .so in /usr/man/man3xi man pages diff -r 66778b3a7858 -r 924b7feb31b8 open-src/lib/libXi/Makefile --- a/open-src/lib/libXi/Makefile Fri Sep 23 14:55:41 2011 -0700 +++ b/open-src/lib/libXi/Makefile Fri Sep 23 14:56:26 2011 -0700 @@ -36,7 +36,8 @@ TARBALL_SHA1 = c66cfdee74e8d169a7992b5f257395e653ca761b # Patches to apply to source after unpacking, in order -SOURCE_PATCHES = solaris-abi.patch,-p1 man-fixme.patch,-p1 +SOURCE_PATCHES = solaris-abi.patch,-p1 +SOURCE_PATCHES += man-fixme.patch,-p1 shadow-man-pages.patch,-p1 # Need to regen Makefile.in after man-fixme.patch changes Makefile.am AUTORECONF=yes diff -r 66778b3a7858 -r 924b7feb31b8 open-src/lib/libXi/shadow-man-pages.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/open-src/lib/libXi/shadow-man-pages.patch Fri Sep 23 14:56:26 2011 -0700 @@ -0,0 +1,31 @@ +From 194e09bd80c96bd3826b455e8c38371770889217 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Fri, 16 Sep 2011 18:51:21 -0700 +Subject: [PATCH:libXi] Make shadow man pages generated by asciidoc work with Solaris man + +Solaris man requires .so entries in man pages include the man section +directory, not just the man page filename, even when it's in the same +directory, so use sed to add it in. + +Signed-off-by: Alan Coopersmith +--- + man/Makefile.am | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index d4c37b3..28211a1 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -159,6 +159,9 @@ MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' + MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' + MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' + ++# asciidoc generates shadow page references without the man section directory ++MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/' ++ + SUFFIXES = .man .$(LIB_MAN_SUFFIX) + .man.$(LIB_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +-- +1.7.3.2 +