[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCHv2] docs: install the generated html files when make install is run



On 10/24/2010 03:34 AM, Justin Clift wrote:
Previously, only the API docs were installed, rather than the
complete documentation set.  This commit ensures the complete
documentation set is installed.
---
  docs/Makefile.am |   11 ++++++++++-
  1 files changed, 10 insertions(+), 1 deletions(-)

@@ -169,6 +174,10 @@ rebuild: api all

  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+	for f in $(css) $(dot_html); do \
+	  $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done
+	for f in $(gif) $(png); do \
+	  $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done

Any reason this is done as two for loops instead of one?

ACK once you rewrite this as:

for f in $(css) $(dot_html) $(gif) $(png); do \
  $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done

As a side note, recent automake has gone to efforts to speed up installation by using a single install invocation on multiple target files all going to the same directory. Unfortunately, until we can rely on automake 1.11 being a minimum development requirement, I don't know if we can take advantage of any of those speedups, because older install-sh scripts (necessary on systems where install(1) is less-than-stellar) didn't support multiple arguments. For reference, here's the automake NEWS snippet:

  - The targets `install' and `uninstall' are more efficient now, in that
    for example multiple files from one Automake variable such as
    `bin_SCRIPTS' are copied in one `install' (or `libtool --mode=install')
    invocation if they do not have to be renamed.

--
Eric Blake   eblake redhat com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]