Changeset 2853 for trunk/doc


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/doc/Makefile.am

    r2787 r2853  
    4444if DX_ENABLE_HTML
    4545html-local: doc/$(DX_HTML_OUTPUT)/index.html
     46INSTALL_CHECK_TARGETS += installcheck-html
    4647endif
    4748
     
    6566install-html-local:
    6667  @$(NORMAL_INSTALL)
    67   @if test -d $(DX_HTML_OUTPUT); then \
     68  @if test -d doc/$(DX_HTML_OUTPUT); then \
    6869    test -z "$(DESTDIR)$(htmldir)" || \
    6970    { $(MKDIR_P) "$(DESTDIR)$(htmldir)"; \
     
    7677  rm -rf $(DESTDIR)$(htmldir)
    7778
     79# check that html has been installed (only activated when DX_ENABLE_HTML)
     80## see ticket #721
     81installcheck-html:
     82  $(AM_V_at) test -r "$(DESTDIR)/$(htmldir)/index.html" \
     83  || { echo "no documentation installed" 1>&2; exit 1; }
     84  $(AM_V_at)grep "yat.*$(VERSION)" "$(DESTDIR)/$(htmldir)/index.html" \
     85  || { echo $(DESTDIR)/$(htmldir)/index.html not updated 1>&2; exit 1; }
     86
    7887MOSTLYCLEANFILES += doc/doxygen.error
Note: See TracChangeset for help on using the changeset viewer.