[gnome-common] Fix srcdir!=builddir for Scrollkeeper, bug 315320
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-common] Fix srcdir!=builddir for Scrollkeeper, bug 315320
- Date: Wed, 1 Aug 2012 21:49:28 +0000 (UTC)
commit 1b2fb3fb47405908eb53d0db46329a64a1697a59
Author: LoÃc Minier <lool dooz org>
Date: Wed Aug 1 22:42:43 2012 +0100
Fix srcdir!=builddir for Scrollkeeper, bug 315320
doc-build/omf.make | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/doc-build/omf.make b/doc-build/omf.make
index cb7acba..0572f84 100644
--- a/doc-build/omf.make
+++ b/doc-build/omf.make
@@ -36,7 +36,9 @@ 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
@@ -48,7 +50,7 @@ install-data-hook-omf:
-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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]