diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2006-08-28 21:14:14 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2006-08-28 21:14:14 +0000 |
| commit | 7d4b9223b39a4724c67d4b2ea425f569f4eaa8cf (patch) | |
| tree | d7822ee8e25b427989d6699ecb1c4a620f33960f | |
| parent | 6051e3958774dcebe0134a0c92d618434ecdc066 (diff) | |
| download | pygobject-7d4b9223b39a4724c67d4b2ea425f569f4eaa8cf.tar.gz pygobject-7d4b9223b39a4724c67d4b2ea425f569f4eaa8cf.tar.xz pygobject-7d4b9223b39a4724c67d4b2ea425f569f4eaa8cf.zip | |
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | docs/Makefile.am | 10 |
3 files changed, 15 insertions, 4 deletions
@@ -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. @@ -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) \ |