diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-08 19:06:51 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-08 19:06:51 +0000 |
| commit | 2a8be5a2f5d9c848e10c8c505f02eebd48276c3a (patch) | |
| tree | cf472e6a25045858312a88ec8db2ccc5c11dfc7d | |
| parent | 5a548fbf641bbd93d28009281c97e3e1aab1adad (diff) | |
| parent | a9e14209a25051a119a207a014750af83251b6b1 (diff) | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -18,6 +18,9 @@ D-Bus 1.5.10 (UNRELEASED) • Avoid use of deprecated GThread API (fd.o #44413, Martin Pitt) +• Build documentation correctly if man2html doesn't support filenames on + its command-line (fd.o #43875, Jack Nagel) + • Unix-specific: · Use epoll(7) for a more efficient main loop in Linux; equivalent patches welcomed for other OSs' equivalents like kqueue, /dev/poll, or Solaris diff --git a/doc/Makefile.am b/doc/Makefile.am index 3fdb7803..591efc99 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -118,7 +118,7 @@ if DBUS_HAVE_MAN2HTML html_DATA += $(MAN_HTML_FILES) %.1.html: %.1 - $(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ ) + $(AM_V_GEN)( $(MAN2HTML) < $< > $@.tmp && mv $@.tmp $@ ) endif if DBUS_CAN_UPLOAD_DOCS |