Revision 65dfd777

b/Makefile.am
228 228
	sed -f $(REPLACE_VARS_SED) < $< > $@
229 229

  
230 230
doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
231
	$(DOCBOOK_WRAPPER) $< $@
231
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
232 232

  
233 233
doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
234
	$(DOCBOOK_WRAPPER) $< $@
234
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
235 235

  
236 236
doc/%.html: doc/%.rst
237 237
	$(RST2HTML) $< $@
238 238

  
239
doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
239
doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
240 240

  
241 241
doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
242 242
	PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
243 243

  
244 244
man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
245
	$(DOCBOOK_WRAPPER) $< $@
245
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
246 246

  
247 247
man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
248
	$(DOCBOOK_WRAPPER) $< $@
248
	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
249 249

  
250 250
man/footer.sgml $(TESTS): srclinks
251 251

  
b/autotools/docbook-wrapper
2 2

  
3 3
set -e
4 4

  
5
input="${1}"
6
output="${2}"
5
if test "$#" != 3
6
then
7
  echo "Wrong number of arguments." >&2
8
  exit 1
9
fi
10

  
11
cmd="${1}"
12
input="${2}"
13
output="${3}"
7 14

  
8 15
# docbook2man inserts a date formatted using the current locale into its
9 16
# output. Using the "C" locale makes sure it's always in the default format.
10 17
export LC_ALL=C
11 18

  
12
case "${output}" in
13
  *.pdf) cmd=docbook2pdf ;;
14
  *.html) cmd='docbook2html --nochunks' ;;
15
  *.7|*.8) cmd=docbook2man ;;
16
  *)
17
    echo "Unknown filetype: ${output}" >&2
18
    exit 1
19
  ;;
20
esac
21

  
22 19
tmpdir=`mktemp -d`
23 20
trap "rm -rf ${tmpdir}" EXIT
24 21

  
......
27 24
then
28 25
  echo "Building ${output} failed." >&2
29 26
  exit 1
30
fi;
27
fi
31 28

  
32 29
mv "${tmpdir}/`basename "${output}"`" "${output}"
33 30

  

Also available in: Unified diff