Changeset 2487 for trunk/doc


Ignore:
Timestamp:
May 27, 2011, 4:55:25 PM (10 years ago)
Author:
Peter
Message:

Change the semantics of htmldir and where htlm docs are
installed. Before html was installed in ${htmldir}/html and ${htmldir}
was by default set to 'htmldir=${docdir}'. The current behavior is
that htmldir is defult set to 'htmldir=${docdir}/html' and html docs
are installed in ${htmldir}. Thus the default behavior is not changed,
i.e., docs are before and after this change installed in
${docdir}/html. This change leaves more flexibility to the user who can now
configure where to install the html output.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/Makefile.am

    r2486 r2487  
    7575  @$(MAKE) $(AM_MAKEFLAGS) install-html
    7676
    77 uninstall-hook:
    78   @$(NORMAL_UNINSTALL)
    79   rm -rf $(DESTDIR)$(htmldir)/html
    80 
    8177installdirs-local:
    82   $(MKDIR_P) "$(DESTDIR)$(htmldir)/html";
     78  $(MKDIR_P) "$(DESTDIR)$(htmldir)";
    8379
    8480# local install rules does not generate any documentation, in order to
     
    9187  @$(NORMAL_INSTALL)
    9288  @if test -d $(DX_HTML_OUTPUT); then \
    93     echo "$(MKDIR_P) $(DESTDIR)$(htmldir)/html"; \
    94     $(MKDIR_P) $(DESTDIR)$(htmldir)/html;\
    95     echo "$(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html";\
    96     $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)/html; \
     89    echo "$(MKDIR_P) $(DESTDIR)$(htmldir)"; \
     90    $(MKDIR_P) $(DESTDIR)$(htmldir);\
     91    echo "$(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir)";\
     92    $(INSTALL_DATA) $(DX_HTML_OUTPUT)/* $(DESTDIR)$(htmldir); \
    9793  fi
    9894
Note: See TracChangeset for help on using the changeset viewer.