| author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
| Fri, 06 Apr 2012 21:57:14 -0700 | |
| changeset 1265 | 0b5cc5c013e4 |
| parent 1215 | 924b7feb31b8 |
| permissions | -rw-r--r-- |
|
1215
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
From 194e09bd80c96bd3826b455e8c38371770889217 Mon Sep 17 00:00:00 2001 |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
From: Alan Coopersmith <[email protected]> |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
Date: Fri, 16 Sep 2011 18:51:21 -0700 |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
Subject: [PATCH:libXi] Make shadow man pages generated by asciidoc work with Solaris man |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
Solaris man requires .so entries in man pages include the man section |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
directory, not just the man page filename, even when it's in the same |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
directory, so use sed to add it in. |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
Signed-off-by: Alan Coopersmith <[email protected]> |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
--- |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
man/Makefile.am | 3 +++ |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
1 files changed, 3 insertions(+), 0 deletions(-) |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
|
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
diff --git a/man/Makefile.am b/man/Makefile.am |
|
1265
0b5cc5c013e4
7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
1215
diff
changeset
|
16 |
index 7e328a5..0af2c5f 100644 |
|
1215
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
--- a/man/Makefile.am |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
+++ b/man/Makefile.am |
|
1265
0b5cc5c013e4
7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
1215
diff
changeset
|
19 |
@@ -166,6 +166,9 @@ MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/' |
|
1215
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/' |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/' |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
|
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
+# asciidoc generates shadow page references without the man section directory |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
+MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/' |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
+ |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
SUFFIXES = .man .$(LIB_MAN_SUFFIX) |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
.man.$(LIB_MAN_SUFFIX): |
|
924b7feb31b8
7091272 Missing reference of .so in /usr/man/man3xi man pages
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
28 |
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |