[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: c0b0065cc70470e1a511cd7a5e
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: c0b0065cc70470e1a511cd7a5e5ac3ebadffd40a |
Date: |
Fri, 18 Feb 2011 20:55:08 +0100 (CET) |
revision: c0b0065cc70470e1a511cd7a5e5ac3ebadffd40a
date: 2011-02-18T01:59:13
author: Richard Levitte <address@hidden>
branch: net.venge.monotone
changelog:
* doc/Makefile.am (htmldir, html_DATA, htmlfiguredir, htmlfigure_DATA)
(htmlimagedir, htmlimage_DATA): Remove. They didn't work well for us,
didn't become part of a general HTML installation. Instead, we...
(install-html-support, install-html-multifile): ... use our own
installer, hooked in through ...
(install-html-local): ... this.
manifest:
format_version "1"
new_manifest [c3c9515656f0098d974efec7e1a4bcaedda6b6ff]
old_revision [0092f5bfbe3480c2eb937517a1134ca4208ab90b]
patch "doc/Makefile.am"
from [f9183332ce62e37d94cf978b6eb455b896c07c89]
to [88c2b91289880ea9c9ef32f08e224547287f8fd7]
============================================================
--- doc/Makefile.am f9183332ce62e37d94cf978b6eb455b896c07c89
+++ doc/Makefile.am 88c2b91289880ea9c9ef32f08e224547287f8fd7
@@ -12,15 +12,6 @@ ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
ACLOCAL_AMFLAGS = -I m4
-htmldir = $(docdir)/html
-html_DATA = texinfo.css
-
-htmlfiguredir = $(htmldir)/figures
-htmlfigure_DATA = $(PNG_FIGURES)
-
-htmlimagedir = $(htmldir)/images
-htmlimage_DATA = $(PNG_IMAGES)
-
CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" ]
PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf \
@@ -57,8 +48,8 @@ EXTRA_DIST = \
monotone_TEXINFOS = $(top_srcdir)/src/std_hooks.lua $(TEXI_FRAGMENTS)
EXTRA_DIST = \
- $(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS) \
- figures/monotone-logo.svg figures/oo-figures.sxd \
+ $(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS) $(HTML_EXTRA) \
+ figures/monotone-logo.svg figures/oo-figures.sxd \
figures/pdfcrop.pl figures/README
AM_MAKEINFOFLAGS= -I $(top_srcdir)/src -I $(srcdir)
@@ -96,7 +87,7 @@ AM_MAKEINFODOCHTMLFLAGS= -I $(top_srcdir
# Because automake already generates a html target that produces a single file
# HTML, we have to use a different target to make a multifile HTML.
-htmldir: monotone.texi $(srcdir)/version.texi $(monotone_TEXINFOS) $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
+html-multifile: monotone.texi $(srcdir)/version.texi $(monotone_TEXINFOS) $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
$(MKDIR_P) html.htp && \
cp $(addprefix $(srcdir)/,$(HTML_EXTRA)) html.htp
$(MKDIR_P) html.htp/figures && \
@@ -115,8 +106,23 @@ html/$(am__dirstamp):
@$(MKDIR_P) html
@touch $@
# Then let's have the html target produce the multifile HTML as well.
-html-local: htmldir
+html-local: html-multifile
+htmldir = $(docdir)/html
+
+install-html-local: install-html-support install-html-multifile
+install-html-support: $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
+ test -n "$(htmldir)"
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+ $(INSTALL_DATA) $(HTML_EXTRA) $(DESTDIR)$(htmldir)
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/figures"
+ $(INSTALL_DATA) $(PNG_FIGURES) $(DESTDIR)$(htmldir)/figures
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/images"
+ $(INSTALL_DATA) $(PNG_IMAGES) $(DESTDIR)$(htmldir)/images
+install-html-multifile: html-multifile
+ test -n "$(htmldir)"
+ $(INSTALL_DATA) html/*.html $(DESTDIR)$(htmldir)
+
# Because we don't want to have the different document targets depend on
# irrelevant files, we have these dependencies lists.
# NOTE: This wouldn't work if this Makefile had been part of the top Makefile,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: c0b0065cc70470e1a511cd7a5e5ac3ebadffd40a,
code <=