[goffice] docs: undo 12+ year old weirdness that now conflicts with distcheck
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] docs: undo 12+ year old weirdness that now conflicts with distcheck
- Date: Sat, 20 Aug 2016 20:00:14 +0000 (UTC)
commit 77a8e9e86a1e93bf64817d2a3f4217c67e3a1c13
Author: Morten Welinder <terra gnome org>
Date: Sat Aug 20 15:59:36 2016 -0400
docs: undo 12+ year old weirdness that now conflicts with distcheck
docs/reference/Makefile.am | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index d241560..7e2978d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
DOC_MODULE=goffice-@GOFFICE_API_VER@
DOC_MAIN_SGML_FILE=goffice-docs.xml
@@ -38,9 +40,7 @@ endif
HTML_IMAGES=
-content_files = \
- $(top_srcdir)/docs/reference/version.xml
-
+content_files =
expand_content_files=
GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(GOFFICE_CFLAGS)
@@ -48,8 +48,7 @@ GTKDOC_LIBS = $(top_builddir)/goffice/libgoffice-@GOFFICE_API_VER@.la $(GOFFICE_
include $(top_srcdir)/gtk-doc.make
-# To work around bug #314105, we have to distribute the generated file, too.
-EXTRA_DIST += version.xml.in version.xml
+EXTRA_DIST += version.xml.in
CLEANFILES += \
goffice-@GOFFICE_API_VER -decl-list txt \
@@ -60,6 +59,3 @@ CLEANFILES += \
goffice-@GOFFICE_API_VER -undocumented txt \
goffice-@GOFFICE_API_VER@.types \
html/* tmpl/* xml/*
-
-$(top_srcdir)/docs/reference/version.xml:
- cp $(top_builddir)/docs/reference/version.xml $@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]