Changeset 2853 for trunk/doc

Timestamp:

Sep 24, 2012, 1:56:38 AM (9 years ago)

Author:

Peter

Message:

merge patch release 0.9.1 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/Makefile.am (modified) (3 diffs)

trunk/doc/Makefile.am

@@ -44 +44 @@
 if DX_ENABLE_HTML
 html-local: doc/$(DX_HTML_OUTPUT)/index.html
+INSTALL_CHECK_TARGETS += installcheck-html
 endif
 
@@ -65 +66 @@
 install-html-local:
   @$(NORMAL_INSTALL)
-  @if test -d $(DX_HTML_OUTPUT); then \
+  @if test -d doc/$(DX_HTML_OUTPUT); then \
     test -z "$(DESTDIR)$(htmldir)" || \
     { $(MKDIR_P) "$(DESTDIR)$(htmldir)"; \
@@ -76 +77 @@
   rm -rf $(DESTDIR)$(htmldir)
 
+# check that html has been installed (only activated when DX_ENABLE_HTML)
+## see ticket #721
+installcheck-html:
+  $(AM_V_at) test -r "$(DESTDIR)/$(htmldir)/index.html" \
+  || { echo "no documentation installed" 1>&2; exit 1; }
+  $(AM_V_at)grep "yat.*$(VERSION)" "$(DESTDIR)/$(htmldir)/index.html" \
+  || { echo $(DESTDIR)/$(htmldir)/index.html not updated 1>&2; exit 1; }
+
 MOSTLYCLEANFILES += doc/doxygen.error