Changeset 2841


Ignore:
Timestamp:
Sep 17, 2012, 3:38:14 AM (9 years ago)
Author:
Peter
Message:

fixes #721. fix install-html-local rule and add a install-check rule just checking that html got installed to catch this problem within distcheck

Location:
branches/0.9-stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.9-stable/Makefile.am

    r2787 r2841  
    3232EXTRA_DIST =
    3333MOSTLYCLEANFILES =
     34## append targets to this variable for tests included in 'make installcheck'
     35INSTALL_CHECK_TARGETS =
    3436
    3537FORCE:
     
    6466clean-local:
    6567  rm -rf doc/$(DX_HTML_OUTPUT) test/yathello test/testSubDir
     68
     69installcheck-local: $(INSTALL_CHECK_TARGETS)
    6670
    6771.PHONY: doc maintainer-check news-check svn-check svn-clean release
  • branches/0.9-stable/doc/Makefile.am

    r2787 r2841  
    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
  • branches/0.9-stable/test/Makefile.am

    r2809 r2841  
    196196  && rm -rf $(yat_hello_tmp_files)
    197197
    198 installcheck-local: yat-hello-check
     198INSTALL_CHECK_TARGETS += yat-hello-check
    199199
    200200yat-hello-check: $(srcdir)/test/yat-hello-1.0.tar.gz
Note: See TracChangeset for help on using the changeset viewer.