Bug 41047 - `make maintainer-upload-docs` doesn't work out-of-tree
Summary: `make maintainer-upload-docs` doesn't work out-of-tree
Alias: None
Product: dbus
Classification: Unclassified
Component: core (show other bugs)
Version: 1.4.x
Hardware: Other All
: medium normal
Assignee: Simon McVittie
QA Contact: John (J5) Palmieri
URL: http://cgit.freedesktop.org/~smcv/dbu...
Keywords: patch
Depends on:
Blocks: dbus-1.4
  Show dependency treegraph
Reported: 2011-09-20 10:49 UTC by Simon McVittie
Modified: 2011-09-21 03:41 UTC (History)
3 users (show)

See Also:
i915 platform:
i915 features:

Fix maintainer-upload-docs target to work out-of-tree (3.55 KB, patch)
2011-09-20 10:49 UTC, Simon McVittie
Details | Splinter Review

Description Simon McVittie 2011-09-20 10:49:46 UTC
Created attachment 51415 [details] [review]
Fix maintainer-upload-docs target to work out-of-tree

The STATIC_DOCS, DTDS and all dist_ files except XMLTO_OUTPUT are in the
source tree. The XMLTO_OUTPUT and the man2html output are in the build
tree, and the BONUS_FILES already have $(srcdir) in their names.
Also change the rules that generate the dbus-docs directory so that if
they fail, they leave behind a temporary directory, rather than leaving
behind a dbus-docs directory that causes make to not run those rules
if re-run; and change the rules to scp files to the server, to put a
trailing "/" on paths, ensuring that the tarball won't be uploaded as
"www" if the www directory doesn't already exist.


The patch is for dbus-1.4 but should apply to master - doc hasn't changed much. Tested by uploading to a local server.
Comment 1 Will Thompson 2011-09-21 01:01:39 UTC
Review of attachment 51415 [details] [review]:

Looks fine, commit away!
Comment 2 Simon McVittie 2011-09-21 03:41:36 UTC
Fixed in git for 1.4.16 and 1.5.8, thanks

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.