summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-06-24 13:21:15 +0100
committerSimon McVittie <smcv@collabora.com>2022-07-13 20:36:13 +0100
commit37e1728638c5caaac393a0db756ce304aa611db1 (patch)
tree4cfbd3dff6d16bc4549f171abb7840a875153143 /doc
parent4655d00952001a794bd152b2aaf797e5f478de37 (diff)
downloaddbus-37e1728638c5caaac393a0db756ce304aa611db1.tar.gz
maintainer-upload-docs: Remove assumptions about source, build dirs
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/maintainer-upload-docs.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/maintainer-upload-docs.sh b/doc/maintainer-upload-docs.sh
index da304087..f090cf46 100644
--- a/doc/maintainer-upload-docs.sh
+++ b/doc/maintainer-upload-docs.sh
@@ -28,6 +28,17 @@ set -eux
: "${SPECIFICATION_SERVER:=specifications.freedesktop.org}"
: "${SPECIFICATION_PATH:=/srv/specifications.freedesktop.org/www/dbus/1.0}"
+if [ -n "${MESON_BUILD_ROOT-}" ]; then
+ cd "${MESON_BUILD_ROOT}"
+fi
+
+if [ -n "${MESON_SOURCE_ROOT-}" ]; then
+ top_srcdir="${MESON_SOURCE_ROOT}"
+else
+ # assume build directory is inside source directory
+ top_srcdir=".."
+fi
+
TMPDIR=$(mktemp -d)
mkdir -p "$TMPDIR/api"
@@ -39,4 +50,4 @@ tar --xz -c -f dbus-docs.tar.xz dbus-docs
scp dbus-docs.tar.xz "$DOC_SERVER:$DOC_WWW_DIR/"
rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX dbus-docs/ "$DOC_SERVER:$DOC_WWW_DIR/doc/"
-scp -p ../doc/*.dtd "$SPECIFICATION_SERVER:$SPECIFICATION_PATH/"
+scp -p "$top_srcdir"/doc/*.dtd "$SPECIFICATION_SERVER:$SPECIFICATION_PATH/"