From 7d4b9223b39a4724c67d4b2ea425f569f4eaa8cf Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@src.gnome.org>
Date: Mon, 28 Aug 2006 21:14:14 +0000
Subject: Install html files regardless even when passing in --disable-docs,
 fixes

    * docs/Makefile.am: Install html files regardless even when passing
    in --disable-docs, fixes #353159 (Matthias Clasen)
---
 ChangeLog        |  5 +++++
 NEWS             |  4 ++++
 docs/Makefile.am | 10 ++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 071dadd..91bccaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-28  Johan Dahlin  <jdahlin@async.com.br>
+
+	* docs/Makefile.am: Install html files regardless even when passing
+	in --disable-docs, fixes #353159 (Matthias Clasen)
+
 2006-08-27  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* configure.ac: Post-release version bump.
diff --git a/NEWS b/NEWS
index 9a54b9d..544534a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2.11.5 ?-?-2006
+      - Install the html files even when using --disable-docs (#353159, Johan,
+        Matthias Clasen)
+
 2.11.4 27-august-2006
       - Include pre-generated html docs in the tarball  (Johan)
       - Fix bug in do_set_property called from constructor (Gustavo, #353039)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a3c68d1..0c50aee 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,7 +5,6 @@ BUILDDIR = $(top_builddir)/docs
 
 CSS_FILES = style.css
 
-if ENABLE_DOCS
 HTML_FILES =					\
 	html/class-gobjectgboxed.html		\
 	html/class-gobjectginterface.html	\
@@ -21,8 +20,11 @@ HTML_FILES =					\
 	html/pygobject.devhelp			\
 	html/pygobject-introduction.html	\
 	html/pygobject-reference-copyright.html
+
+if ENABLE_DOCS
+BUILT_HTML_FILES = $(HTML_FILES)
 else
-HTML_FILES =
+BUILT_HTML_FILES =
 endif
 
 XML_FILES = 					\
@@ -59,9 +61,9 @@ HTML_DATA = $(HTML_FILES)
 XSLdir = $(datadir)/pygobject/xsl
 XSL_DATA = $(XSL_FILES) $(FIXXREF)
 
-BUILT_SOURCES = reference/builddate.xml $(HTML_FILES)
+BUILT_SOURCES = reference/builddate.xml $(BUILT_HTML_FILES)
 
-CLEANFILES = reference/builddate.xml $(HTML_FILES)
+CLEANFILES = reference/builddate.xml $(BUILT_HTML_FILES)
 
 EXTRA_DIST = 		\
 	$(HTML_FILES) 	\
-- 
cgit