| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Mon, 11 Apr 2011 11:04:15 -0700 | |
| changeset 1112 | 4778e9ecf66e |
| permissions | -rw-r--r-- |
|
1112
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
From 78a05d38e4736d75a175a1b99270940f83a24b56 Mon Sep 17 00:00:00 2001 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
From: Alan Coopersmith <[email protected]> |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
Date: Fri, 8 Apr 2011 21:36:11 -0700 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
Subject: [PATCH:libX11] Make doc install directories match pre-docbook.am paths |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
Signed-off-by: Alan Coopersmith <[email protected]> |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
--- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
specs/i18n/framework/Makefile.am | 2 +- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
specs/i18n/localedb/Makefile.am | 2 +- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
specs/i18n/trans/Makefile.am | 2 +- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
specs/libX11/Makefile.am | 2 +- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
4 files changed, 4 insertions(+), 4 deletions(-) |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
index 350b7df..af7ae1d 100644 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
--- a/specs/i18n/framework/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ b/specs/i18n/framework/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -8,7 +8,7 @@ docbook = framework.xml |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
chapters = framework.svg |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
# The location where the DocBook/XML files and their generated formats are installed |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
-shelfdir = $(docdir)/framework |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
+shelfdir = $(docdir)/i18n/framework |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
# Generate DocBook/XML output formats with or without stylesheets |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
include $(top_srcdir)/docbook.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
28 |
index 0c52a13..68a917c 100644 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
29 |
--- a/specs/i18n/localedb/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
30 |
+++ b/specs/i18n/localedb/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
31 |
@@ -5,7 +5,7 @@ if ENABLE_SPECS |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
32 |
docbook = localedb.xml |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
33 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
34 |
# The location where the DocBook/XML files and their generated formats are installed |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
35 |
-shelfdir = $(docdir)/localedb |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
36 |
+shelfdir = $(docdir)/i18n/localedb |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
37 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
38 |
# Generate DocBook/XML output formats with or without stylesheets |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
39 |
include $(top_srcdir)/docbook.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
40 |
diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
41 |
index 6e4baf1..40a135a 100644 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
42 |
--- a/specs/i18n/trans/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
43 |
+++ b/specs/i18n/trans/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
44 |
@@ -5,7 +5,7 @@ if ENABLE_SPECS |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
45 |
docbook = trans.xml |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
46 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
47 |
# The location where the DocBook/XML files and their generated formats are installed |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
48 |
-shelfdir = $(docdir)/trans |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
49 |
+shelfdir = $(docdir)/i18n/trans |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
50 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
51 |
# Generate DocBook/XML output formats with or without stylesheets |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
52 |
include $(top_srcdir)/docbook.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
53 |
diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
54 |
index c4de67e..b87e568 100644 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
55 |
--- a/specs/libX11/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
56 |
+++ b/specs/libX11/Makefile.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
57 |
@@ -30,7 +30,7 @@ chapters = \ |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
58 |
glossary.xml |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
59 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
60 |
# The location where the DocBook/XML files and their generated formats are installed |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
61 |
-shelfdir = $(docdir) |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
62 |
+shelfdir = $(docdir)/libX11 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
63 |
|
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
64 |
# Generate DocBook/XML output formats with or without stylesheets |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
65 |
include $(top_srcdir)/docbook.am |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
66 |
-- |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
67 |
1.7.3.2 |
|
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
68 |