1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From 84a7814ae572cb484424b61aafbc70d91b19f409 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 15 Feb 2017 03:53:19 +0100
Subject: [PATCH] Fix installation of HTML images
This affects out-of-tree builds where the configure script is run via an
absolute path.
https://bugzilla.gnome.org/show_bug.cgi?id=674163
---
gtk-doc.make | 1 +
gtk-doc.flat.make | 1 +
2 files changed, 2 insertions(+)
diff --git a/gtk-doc.make b/gtk-doc.make
index b091d88..26dd188 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -215,6 +215,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
for file in $(HTML_IMAGES) ; do \
test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ test -f $$file && cp $$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
diff --git a/gtk-doc.flat.make b/gtk-doc.flat.make
index 5709b54..dfcc7dd 100644
--- a/gtk-doc.flat.make
+++ b/gtk-doc.flat.make
@@ -191,6 +191,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
for file in $(HTML_IMAGES) ; do \
test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ test -f $$file && cp $$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
--
2.11.0
|