- Timestamp:
- Sep 24, 2012, 1:56:38 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/0.8-stable merged: 2845 /branches/0.9-stable merged: 2839-2841,2843-2844,2846-2851
- Property svn:mergeinfo changed
-
trunk/doc/Makefile.am
r2787 r2853 44 44 if DX_ENABLE_HTML 45 45 html-local: doc/$(DX_HTML_OUTPUT)/index.html 46 INSTALL_CHECK_TARGETS += installcheck-html 46 47 endif 47 48 … … 65 66 install-html-local: 66 67 @$(NORMAL_INSTALL) 67 @if test -d $(DX_HTML_OUTPUT); then \68 @if test -d doc/$(DX_HTML_OUTPUT); then \ 68 69 test -z "$(DESTDIR)$(htmldir)" || \ 69 70 { $(MKDIR_P) "$(DESTDIR)$(htmldir)"; \ … … 76 77 rm -rf $(DESTDIR)$(htmldir) 77 78 79 # check that html has been installed (only activated when DX_ENABLE_HTML) 80 ## see ticket #721 81 installcheck-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 78 87 MOSTLYCLEANFILES += doc/doxygen.error
Note: See TracChangeset
for help on using the changeset viewer.