Changeset 3968 for trunk/doc


Ignore:
Timestamp:
Aug 11, 2020, 6:10:01 AM (10 months ago)
Author:
Peter
Message:

merge r3967 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/doc/Makefile.am

    r3966 r3968  
    4545endif
    4646
     47EXTRA_DIST += doc/doxygen.config.in
     48
    4749doc/doxygen.config: doc/doxygen.config.in
    4850  $(AM_V_GEN)echo "# $@ generated by make from doc/doxygen.config.in." \
     
    6971install-html-local:
    7072  @$(NORMAL_INSTALL)
    71   @if test -d doc/$(DX_HTML_OUTPUT); then \
     73  @if test -d doc/html; then \
    7274    test -z "$(DESTDIR)$(htmldir)" || \
    7375    { $(MKDIR_P) "$(DESTDIR)$(htmldir)"; \
    74       $(INSTALL_DATA) doc/$(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir); \
     76      $(INSTALL_DATA) doc/html/* $(DESTDIR)$(htmldir); \
    7577    } \
    7678  fi
Note: See TracChangeset for help on using the changeset viewer.