Skip to content

Commit

Permalink
Install html files regardless even when passing in --disable-docs, fixes
Browse files Browse the repository at this point in the history
    * docs/Makefile.am: Install html files regardless even when passing
    in --disable-docs, fixes #353159 (Matthias Clasen)
  • Loading branch information
Johan Dahlin committed Aug 28, 2006
1 parent 6051e39 commit 7d4b922
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
5 changes: 5 additions & 0 deletions 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.
Expand Down
4 changes: 4 additions & 0 deletions 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)
Expand Down
10 changes: 6 additions & 4 deletions docs/Makefile.am
Expand Up @@ -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 \
Expand All @@ -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 = \
Expand Down Expand Up @@ -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) \
Expand Down

0 comments on commit 7d4b922

Please sign in to comment.