[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 03c62e56f7b4a470bcf64c418f3a365bfe2b1373

[code]

revision:            03c62e56f7b4a470bcf64c418f3a365bfe2b1373
date:                2011-02-02T12:56:14
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:
explicit merge of '0dab54e527942870c7d76bd6ddc53c530dfdfb0f'
              and '3e586ac1c9520a9841d62050fbcab3157e70155f'



manifest:
format_version "1"

new_manifest [d90917c7c2a1aec95a0f73e29055577eb5463eed]

old_revision [0dab54e527942870c7d76bd6ddc53c530dfdfb0f]

patch "doc/Makefile.am"
 from [a99a7cc6a26dcc476f80b65c64b4cdaeea006c70]
   to [a131eb49aec9e8316a27277c87b3fed857ca3732]

patch "doc/monotone.texi"
 from [ead09e29daabf7bc4bc3c8b2919371d69116b7ed]
   to [73e344eb1ba340193ab61f755d72979a29c58fde]

old_revision [3e586ac1c9520a9841d62050fbcab3157e70155f]

patch "notes/release-checklist.txt"
 from [35f3d24d6b4d0c1fe4d933764e4196135edf6925]
   to [92f7dfb621c422ab7264d92ab6d1608af1ce4668]
============================================================
--- doc/monotone.texi	ead09e29daabf7bc4bc3c8b2919371d69116b7ed
+++ doc/monotone.texi	73e344eb1ba340193ab61f755d72979a29c58fde
@@ -12,7 +12,6 @@
 
 @syncodeindex fn cp
 @include version.texi
address@hidden monotonevars.texi
 
 @dircategory Programming
 @direntry
@@ -13215,7 +13214,9 @@ @appendix Default hooks
 hooks files (unless @option{--no-builtin-rcfiles} is passed).  It contains the
 default values for all hooks. See @ref{rcfiles}.
 
address@hidden @value{top_srcdir}/src/std_hooks.lua
address@hidden note that this requires -I $(top_srcdir)/src on the makeinfo
address@hidden command line, and $(top_srcdir)/src in TEXINPUTS for texi2dvi
address@hidden std_hooks.lua
 
 @node General Index,  , Default hooks, Top
 @unnumbered General Index
============================================================
--- doc/Makefile.am	a99a7cc6a26dcc476f80b65c64b4cdaeea006c70
+++ doc/Makefile.am	a131eb49aec9e8316a27277c87b3fed857ca3732
@@ -39,47 +39,25 @@ HTML_EXTRA_copied = $(addprefix $(abs_bu
 PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
 HTML_EXTRA_copied = $(addprefix $(abs_builddir)/,$(HTML_EXTRA))
 
-TEXI_VARS = monotonevars.texi
 TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
 
 CLEANFILES = $(EPS_FIGURES) $(PDF_FIGURES_copied) $(PNG_FIGURES_copied) \
-	$(PNG_IMAGES_copied) $(HTML_EXTRA_copied) $(TEXI_VARS)
+	$(PNG_IMAGES_copied) $(HTML_EXTRA_copied)
 
 info_TEXINFOS = monotone.texi
 
-monotone_TEXINFOS = ../src/std_hooks.lua $(TEXI_VARS) $(TEXI_FRAGMENTS)
+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	\
 	figures/pdfcrop.pl figures/README
 
-AM_MAKEINFOFLAGS= -I $(srcdir)
+AM_MAKEINFOFLAGS= -I $(top_srcdir)/src -I $(srcdir)
 
-AM_MAKEINFOHTMLFLAGS= -I $(srcdir) \
+AM_MAKEINFOHTMLFLAGS= -I $(top_srcdir)/src -I $(srcdir) \
 	--number-sections --no-split --no-headers --css-ref=texinfo.css
 
-monotonevars.texi: Makefile
-	rm -f monotonevars.texi
-	echo "@set top_srcdir $(top_srcdir)" >> monotonevars.texi
-	echo "@set top_builddir $(top_builddir)" >> monotonevars.texi
-
-## # Html and pdf dependencies are simply copied.
-## # All other are generated with the rules further down.
-## copy-html-deps: texinfo.css $(PNG_FIGURES) $(PNG_IMAGES)
-## 	for f in texinfo.css $(PNG_FIGURES) $(PNG_IMAGES); do \
-## 	    d=`dirname $$f`; \
-## 	    [ -d $$d ] || $(MKDIR_P) $$d && \
-## 		cmp -s $(srcdir)/$$f $(builddir)/$$f || \
-## 		    cp -v $(srcdir)/$$f $(builddir)/$$f; \
-## 	done
-
-#%.eps: %.epsi
-#	mv -f $< $@
-#
-#%.epsi: %.ps
-#	ps2epsi $< $@
-
 figures/%.eps: figures/%.ps
 	$(MKDIR_P) figures
 	ps2eps <$< >$@
@@ -105,7 +83,7 @@ $(abs_builddir)/texinfo.css: texinfo.css
 	cmp -s $< $@ || cp $< $@
 
 # Stealing code from automake and adapting, we want a HTML file tree as well
-AM_MAKEINFODOCHTMLFLAGS= -I $(srcdir) \
+AM_MAKEINFODOCHTMLFLAGS= -I $(top_srcdir)/src -I $(srcdir) \
 	--number-sections --css-ref=texinfo.css
 
 # Because automake already generates a html target that produces a single file
@@ -138,6 +116,13 @@ html-local: htmldir
 # a subdirectory.
 # Also note that we need to specify everything that automake would specify,
 # since what we write overrides what automake would otherwise produce.
+#
+# For the info and html targets, '@verbatiminclude std_hooks.lua'
+# works with -I $(top_srcdir)/src. However the dvi target requires
+# '$(top_srcdir)/src' in TEXINPUTS. We can't specify a per-target
+# variable for 'dvi', because that would override the automake
+# definition. So we just set TEXINPUTS globally.
+export TEXINPUTS := $(top_srcdir)/src:$(TEXINPUTS)
 monotone.dvi: monotone.texi $(srcdir)/version.texi $(monotone_TEXINFOS) \
 	$(EPS_FIGURES)
 monotone.pdf: monotone.texi $(srcdir)/version.texi $(monotone_TEXINFOS) \
============================================================
--- notes/release-checklist.txt	35f3d24d6b4d0c1fe4d933764e4196135edf6925
+++ notes/release-checklist.txt	92f7dfb621c422ab7264d92ab6d1608af1ce4668
@@ -13,6 +13,15 @@
 1) Make sure that the buildbot looks reasonably green.  Let's not
    release stuff that's known to be broken on any major platforms, eh?
 
+   Also check that the following Makefile targets work:
+
+    Unix and Win32: all check 
+
+    Unix : doc/monotone.pdf doc/monotone.ps distcheck dist distclean
+
+    Win32: win32_installer
+
+
 2) Write user-readable release notes at the top of the NEWS file,
    roughly following the format of existing entries.  Make sure to
    mention any incompatibilities at the top, and generally it's a good