summaryrefslogtreecommitdiff
path: root/doc-build
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-01-03 15:17:29 +0100
committerinfirit <[email protected]>2014-01-03 15:27:58 +0100
commit0c346cec8d4c1eb6c668fcd4134151d2460b4e49 (patch)
tree8f20ea216d5a11f47fb8df9ce6c4b57d9f8b64a9 /doc-build
parent4c625cd5209062aaba6eecdb95b47a219ae7c746 (diff)
downloadmate-common-0c346cec8d4c1eb6c668fcd4134151d2460b4e49.tar.bz2
mate-common-0c346cec8d4c1eb6c668fcd4134151d2460b4e49.tar.xz
Fix srcdir!=builddir for Scrollkeeper
Gnome BUGS urls: http://bugzilla.gnome.org/show_bug.cgi?id=315320 http://bugzilla.gnome.org/show_bug.cgi?id=409060 http://bugzilla.gnome.org/show_bug.cgi?id=685388 Based on GNOME commits: https://git.gnome.org/browse/gnome-common/commit/?id=1b2fb3fb47405908eb53d0db46329a64a1697a59 https://git.gnome.org/browse/gnome-common/commit/?id=960b1bde8d156f61340500a260402264c5320603 https://git.gnome.org/browse/gnome-common/commit/?id=ee12b92340223bb33b9da232132c44cacecc7968
Diffstat (limited to 'doc-build')
-rw-r--r--doc-build/omf.make10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc-build/omf.make b/doc-build/omf.make
index cb7acba..35dec24 100644
--- a/doc-build/omf.make
+++ b/doc-build/omf.make
@@ -36,19 +36,23 @@ omf: omf_timestamp
omf_timestamp: $(omffile)
-for file in $(omffile); do \
- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
+ absfile=$(srcdir)/$$file; \
+ test -r $$file && absfile=$$file; \
+ scrollkeeper-preinstall $(docdir)/$(docname).xml $$absfile $$file.out; \
done; \
touch omf_timestamp
install-data-hook-omf:
$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ absfile=$(srcdir)/$$file.out; \
+ test -r $$file.out && absfile=$$file.out; \
+ $(INSTALL_DATA) $$absfile $(DESTDIR)$(omf_dest_dir)/$$file; \
done
-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
+ -for file in $(omffile); do \
basefile=`basename $$file`; \
rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
done