1 From b95c288c7d897ed3ed9268572b7c097ed2652907 Mon Sep 17 00:00:00 2001 |
|
2 From: Alan Coopersmith <[email protected]> |
|
3 Date: Fri, 8 Apr 2011 13:24:28 -0700 |
|
4 Subject: [PATCH:libX11] Install xml versions of specs even if HAVE_XMLTO is false |
|
5 |
|
6 Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour |
|
7 from before docbook.am changes (commit e8c76407d2f6e3) |
|
8 |
|
9 Signed-off-by: Alan Coopersmith <[email protected]> |
|
10 --- |
|
11 docbook.am | 2 ++ |
|
12 specs/XIM/Makefile.am | 2 -- |
|
13 specs/XKB/Makefile.am | 2 -- |
|
14 specs/i18n/framework/Makefile.am | 2 -- |
|
15 specs/i18n/localedb/Makefile.am | 2 -- |
|
16 specs/i18n/trans/Makefile.am | 2 -- |
|
17 specs/libX11/Makefile.am | 2 -- |
|
18 7 files changed, 2 insertions(+), 12 deletions(-) |
|
19 |
|
20 diff --git a/docbook.am b/docbook.am |
|
21 index 3cf21e8..6937083 100644 |
|
22 --- a/docbook.am |
|
23 +++ b/docbook.am |
|
24 @@ -20,6 +20,7 @@ shelf_DATA = |
|
25 # DocBook/XML file with chapters, appendix and images it includes |
|
26 dist_shelf_DATA = $(docbook) $(chapters) |
|
27 |
|
28 +if HAVE_XMLTO |
|
29 # |
|
30 # Generate DocBook/XML output formats with or without stylesheets |
|
31 # |
|
32 @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ |
|
33 |
|
34 endif HAVE_XSLTPROC |
|
35 endif HAVE_STYLESHEETS |
|
36 +endif HAVE_XMLTO |
|
37 |
|
38 CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) |
|
39 diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am |
|
40 index a1fa72d..68b0b3f 100644 |
|
41 --- a/specs/XIM/Makefile.am |
|
42 +++ b/specs/XIM/Makefile.am |
|
43 @@ -1,6 +1,5 @@ |
|
44 |
|
45 if ENABLE_SPECS |
|
46 -if HAVE_XMLTO |
|
47 |
|
48 # Main DocBook/XML files (DOCTYPE book) |
|
49 docbook = xim.xml |
|
50 @@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM |
|
51 # Generate DocBook/XML output formats with or without stylesheets |
|
52 include $(top_srcdir)/docbook.am |
|
53 |
|
54 -endif HAVE_XMLTO |
|
55 endif ENABLE_SPECS |
|
56 diff --git a/specs/XKB/Makefile.am b/specs/XKB/Makefile.am |
|
57 index 3939db6..90771cc 100644 |
|
58 --- a/specs/XKB/Makefile.am |
|
59 +++ b/specs/XKB/Makefile.am |
|
60 @@ -1,6 +1,5 @@ |
|
61 |
|
62 if ENABLE_SPECS |
|
63 -if HAVE_XMLTO |
|
64 |
|
65 # Main DocBook/XML files (DOCTYPE book) |
|
66 docbook = xkblib.xml |
|
67 @@ -59,5 +58,4 @@ shelfdir = $(docdir)/XKB |
|
68 # Generate DocBook/XML output formats with or without stylesheets |
|
69 include $(top_srcdir)/docbook.am |
|
70 |
|
71 -endif HAVE_XMLTO |
|
72 endif ENABLE_SPECS |
|
73 diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am |
|
74 index 6e8b010..350b7df 100644 |
|
75 --- a/specs/i18n/framework/Makefile.am |
|
76 +++ b/specs/i18n/framework/Makefile.am |
|
77 @@ -1,6 +1,5 @@ |
|
78 |
|
79 if ENABLE_SPECS |
|
80 -if HAVE_XMLTO |
|
81 |
|
82 # Main DocBook/XML files (DOCTYPE book) |
|
83 docbook = framework.xml |
|
84 @@ -14,5 +13,4 @@ shelfdir = $(docdir)/framework |
|
85 # Generate DocBook/XML output formats with or without stylesheets |
|
86 include $(top_srcdir)/docbook.am |
|
87 |
|
88 -endif HAVE_XMLTO |
|
89 endif ENABLE_SPECS |
|
90 diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am |
|
91 index 8db6a7b..0c52a13 100644 |
|
92 --- a/specs/i18n/localedb/Makefile.am |
|
93 +++ b/specs/i18n/localedb/Makefile.am |
|
94 @@ -1,6 +1,5 @@ |
|
95 |
|
96 if ENABLE_SPECS |
|
97 -if HAVE_XMLTO |
|
98 |
|
99 # Main DocBook/XML files (DOCTYPE book) |
|
100 docbook = localedb.xml |
|
101 @@ -11,5 +10,4 @@ shelfdir = $(docdir)/localedb |
|
102 # Generate DocBook/XML output formats with or without stylesheets |
|
103 include $(top_srcdir)/docbook.am |
|
104 |
|
105 -endif HAVE_XMLTO |
|
106 endif ENABLE_SPECS |
|
107 diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am |
|
108 index cdec750..6e4baf1 100644 |
|
109 --- a/specs/i18n/trans/Makefile.am |
|
110 +++ b/specs/i18n/trans/Makefile.am |
|
111 @@ -1,6 +1,5 @@ |
|
112 |
|
113 if ENABLE_SPECS |
|
114 -if HAVE_XMLTO |
|
115 |
|
116 # Main DocBook/XML files (DOCTYPE book) |
|
117 docbook = trans.xml |
|
118 @@ -11,5 +10,4 @@ shelfdir = $(docdir)/trans |
|
119 # Generate DocBook/XML output formats with or without stylesheets |
|
120 include $(top_srcdir)/docbook.am |
|
121 |
|
122 -endif HAVE_XMLTO |
|
123 endif ENABLE_SPECS |
|
124 diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am |
|
125 index 0e59ad8..c4de67e 100644 |
|
126 --- a/specs/libX11/Makefile.am |
|
127 +++ b/specs/libX11/Makefile.am |
|
128 @@ -1,6 +1,5 @@ |
|
129 |
|
130 if ENABLE_SPECS |
|
131 -if HAVE_XMLTO |
|
132 |
|
133 # Main DocBook/XML files (DOCTYPE book) |
|
134 docbook = libX11.xml |
|
135 @@ -36,5 +35,4 @@ shelfdir = $(docdir) |
|
136 # Generate DocBook/XML output formats with or without stylesheets |
|
137 include $(top_srcdir)/docbook.am |
|
138 |
|
139 -endif HAVE_XMLTO |
|
140 endif ENABLE_SPECS |
|
141 -- |
|
142 1.7.3.2 |
|
143 |
|