[Monotone-commits-diffs] net.venge.monotone: c1b3402c93183ff04cfeeea0d06cc130d6e60d18

[code]

revision:            c1b3402c93183ff04cfeeea0d06cc130d6e60d18
date:                2011-02-06T21:52:06
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* Makefile.am (htmldir, html_DATA, htmlfiguredir, htmlfigure_DATA) 
  (htmlimagedir, htmlimage_DATA): Move these from here to...
* doc/Makefile.am: ... here.
  (htmldir): Make this variable use $(docdir) rather than $(datadir).
  (htmldir): Change the dependency $(doc_monotone_TEXINFOS) to
  $(monotone_TEXINFOS) (it was a typo from earlier efforts with the
  docs).

manifest:
format_version "1"

new_manifest [df4f03749ecb8aafc8aeb67debc07a4365841047]

old_revision [60b588f81b8355d8b02c774037039a7a2483c0ae]

patch "Makefile.am"
 from [08db0dd6c5b50db025cb9aea4a8889e8530b41a3]
   to [53d3c25534f157897a9ee15b5a7309ea472de4c5]

patch "doc/Makefile.am"
 from [41b465f606184dd67d15f97a89b99207568bf110]
   to [f9183332ce62e37d94cf978b6eb455b896c07c89]
============================================================
--- Makefile.am	08db0dd6c5b50db025cb9aea4a8889e8530b41a3
+++ Makefile.am	53d3c25534f157897a9ee15b5a7309ea472de4c5
@@ -242,15 +242,6 @@ src_lib3rdparty_a_SOURCES = $(BOOST_SAND
 src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
 			    $(NETXX_SOURCES)
 
-htmldir = $(datadir)/doc/monotone/html
-html_DATA = doc/texinfo.css
-
-htmlfiguredir = $(htmldir)/figures
-htmlfigure_DATA = $(PNG_FIGURES)
-
-htmlimagedir = $(htmldir)/images
-htmlimage_DATA = $(PNG_IMAGES)
-
 bashcompdir = $(sysconfdir)/bash_completion.d
 bashcomp_DATA = extra/shell/monotone.bash_completion
 
============================================================
--- doc/Makefile.am	41b465f606184dd67d15f97a89b99207568bf110
+++ doc/Makefile.am	f9183332ce62e37d94cf978b6eb455b896c07c89
@@ -12,6 +12,15 @@ 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			\
@@ -87,7 +96,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 $(doc_monotone_TEXINFOS) $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
+htmldir: 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 && \