Revision 2ab2b9f5

b/DEVNOTES
5 5
------------------
6 6

  
7 7
Most dependencies from INSTALL, plus:
8
 - docbook2html, docbook2man, docbook2pdf from Docbook tools
8
 - docbook2html, docbook2man from Docbook tools
9 9
   http://sources.redhat.com/docbook-tools/
10 10
 - rst2html from Docutils
11 11
   http://docutils.sourceforge.net/
b/Makefile.am
37 37
	test/data \
38 38
	tools
39 39

  
40
MAINTAINERCLEANFILES = \
41
	$(dochtml) \
42
	$(patsubst %.dot,%.png,$(docdot)) \
43
	$(maninput)
44

  
40 45
CLEANFILES = \
41 46
	autotools/replace_vars.sed \
42 47
	devel/upload \
43
	doc/*.html \
44
	doc/*.in \
45
	doc/*.pdf \
46
	$(patsubst %.dot,%.png,$(docdot)) \
47 48
	doc/rapi-resources.gen \
48 49
	doc/examples/bash_completion \
49 50
	doc/examples/ganeti.initd \
......
52 53
	lib/http/*.py[co] \
53 54
	lib/hypervisor/*.py[co] \
54 55
	lib/rapi/*.py[co] \
55
	man/*.[78] \
56
	man/*.in \
57
	man/*.html \
56
	$(man_MANS) \
57
	$(manhtml) \
58 58
	qa/*.py[co] \
59 59
	test/*.py[co] \
60 60
	stamp-directories \
......
116 116
	doc/install.rst \
117 117
	doc/security.rst
118 118

  
119
dochtml = $(patsubst %.rst,%.html,$(docrst))
120

  
119 121
docdot = \
120 122
	doc/arch-2.0.dot
121 123

  
122
doc_DATA = \
123
	$(patsubst %.rst,%.html,$(docrst))
124
doc_DATA = $(dochtml)
124 125

  
125 126
noinst_DATA = $(manhtml)
126 127

  
......
144 145
	tools/lvmstrap
145 146

  
146 147
EXTRA_DIST = \
148
	$(MAINTAINERCLEANFILES) \
147 149
	NEWS \
148 150
	DEVNOTES \
149 151
	autotools/docbook-wrapper \
......
161 163
	$(dist_TESTS) \
162 164
	$(TEST_FILES) \
163 165
	man/footer.sgml \
164
	$(mansgml) \
166
	$(mansgml) $(maninput) \
165 167
	qa/ganeti-qa.py \
166 168
	qa/qa-sample.json \
167 169
	qa/qa_cluster.py \
......
191 193
	man/gnt-node.8 \
192 194
	man/gnt-os.8
193 195

  
194
maninput = $(patsubst %.7,%.in,$(patsubst %.8,%.in,$(man_MANS)))
195
mansgml = $(patsubst %.in,%.sgml,$(maninput))
196
manhtml = $(patsubst %.in,%.html,$(maninput))
196
mansgml = $(patsubst %.7,%.sgml,$(patsubst %.8,%.sgml,$(man_MANS)))
197
manhtml = $(patsubst %.sgml,%.html,$(mansgml))
198
maninput = $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) $(patsubst %.html,%.html.in,$(manhtml))
197 199

  
198 200
TEST_FILES = \
199 201
	test/data/bdev-both.txt \
......
236 238
		$(REPLACE_VARS_SED)
237 239
	sed -f $(REPLACE_VARS_SED) < $< > $@
238 240

  
239
doc/%.in: doc/%.sgml stamp-directories $(REPLACE_VARS_SED)
240
	sed -f $(REPLACE_VARS_SED) < $< > $@
241

  
242
man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
243
	sed -f $(REPLACE_VARS_SED) < $< > $@
244

  
245
doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
246
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
247

  
248 241
doc/%.html: doc/%.rst
242
	@test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; }
249 243
	$(RST2HTML) $< $@
250 244

  
251 245
doc/%.png: doc/%.dot
246
	@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
252 247
	$(DOT) -Tpng -o $@ $<
253 248

  
254 249
doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
255 250

  
256
doc/rapi.pdf doc/rapi.html: doc/rapi-resources.gen
251
doc/rapi.html: doc/rapi-resources.gen
257 252

  
258 253
doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
259 254
	PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
260 255
	  rm -f $@
261 256

  
262
man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
263
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
257
man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
258
	@test -n "$(DOCBOOK2MAN)" || { echo 'doocbook2html' not found during configure; exit 1; }
259
	TMPDIR=`mktemp -d` && { \
260
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
261
	mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
262
	rm -rf "$$TMPDIR" ; \
263
	}
264

  
265
man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
266
	@test -n "$(DOCBOOK2HTML)" || { echo 'doocbook2html' not found during configure; exit 1; }
267
	TMPDIR=`mktemp -d` && { \
268
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
269
	mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
270
	rm -rf "$$TMPDIR" ; \
271
	}
272

  
273
man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
274
	sed -f $(REPLACE_VARS_SED) < $< > $@
264 275

  
265
man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
266
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
276
man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
277
	sed -f $(REPLACE_VARS_SED) < $< > $@
267 278

  
268
man/%.html: man/%.in $(DOCBOOK_WRAPPER)
269
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
279
man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
280
	sed -f $(REPLACE_VARS_SED) < $< > $@
270 281

  
271 282
man/footer.sgml $(TESTS): srclinks
272 283

  
b/configure.ac
128 128
AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
129 129
if test -z "$DOCBOOK2MAN"
130 130
then
131
  AC_MSG_ERROR([docbook2man not found])
132
fi
133

  
134
AC_ARG_VAR(DOCBOOK2PDF, [docbook2pdf path])
135
AC_PATH_PROG(DOCBOOK2PDF, [docbook2pdf], [])
136
if test -z "$DOCBOOK2PDF"
137
then
138
  AC_MSG_ERROR([docbook2pdf not found])
131
  AC_MSG_WARN([docbook2man not found, man pages rebuild will not be possible])
139 132
fi
140 133

  
141 134
AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
142 135
AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
143 136
if test -z "$DOCBOOK2HTML"
144 137
then
145
  AC_MSG_ERROR([docbook2html not found])
138
  AC_MSG_WARN([docbook2html not found, man pages rebuild will not be possible])
146 139
fi
147 140

  
148 141
# Check for rst programs
......
150 143
AC_PATH_PROG(RST2HTML, [rst2html], [])
151 144
if test -z "$RST2HTML"
152 145
then
153
  AC_MSG_ERROR([rst2html not found])
146
  AC_MSG_WARN([rst2html not found, documentation rebuild will not be possible])
154 147
fi
155 148

  
156 149
# Check for graphviz (dot)
......
158 151
AC_PATH_PROG(DOT, [dot], [])
159 152
if test -z "$DOT"
160 153
then
161
  AC_MSG_ERROR([dot (from the graphviz suite) not found])
154
  AC_MSG_WARN([dot (from the graphviz suite) not found, documentation rebuild not possible])
162 155
fi
163 156

  
164 157
# Check for Python

Also available in: Unified diff