# 
# 
# patch "ChangeLog"
#  from [e7c632d1255db167b49e49566e27df5df7ade4e6]
#    to [3b3c126d680cb4326505b5357e5def73645d621c]
# 
# patch "Makefile.am"
#  from [7403c65538ce562be8863906a6f3d5e72d3abeb1]
#    to [d015f861eed6834f26533667913824ad605f39fb]
# 
============================================================
--- ChangeLog	e7c632d1255db167b49e49566e27df5df7ade4e6
+++ ChangeLog	3b3c126d680cb4326505b5357e5def73645d621c
@@ -1,5 +1,13 @@
 2006-04-07  Nathaniel Smith  <address@hidden>
 
+	* Makefile.am (distcleancheck_listfiles): Attempt to teach
+	distcheck that it's okay that distclean does not remove
+	package_revision.txt and package_full_revision_dist.txt files.
+	Untested, because the test is taking ages and I want to go to
+	sleep, so good luck :-).
+
+2006-04-07  Nathaniel Smith  <address@hidden>
+
 	* figures/README: Add note on PNGs.
 	* figures/{manifest,file-id-manifest-id,revision-chaining,revision}.png:
 	Regenerate PNGs.
============================================================
--- Makefile.am	7403c65538ce562be8863906a6f3d5e72d3abeb1
+++ Makefile.am	d015f861eed6834f26533667913824ad605f39fb
@@ -557,6 +557,21 @@
 	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
+# This is a magic directive copy-and-pasted, then modified, from the
+# automake 1.9 manual, section 13.4, "Checking the distribution".
+# Normally, 'distcheck' does a clean build, and then afterwards runs
+# 'distclean', and 'distclean' is supposed to remove everything that
+# the build created.  However, we have some targets
+# (package_revision.txt, package_full_revision_dist.txt) that we
+# distribute, but then always attempt to rebuild optimistically, and
+# then if that fails fall back on the distributed versions.  This
+# means that 'distclean' should _not_ remove those files, since they
+# are distributed, yet building the package will generate those files,
+# those automake thinks that 'distclean' _should_ remove those files,
+# and 'distcheck' gets cranky if we don't.  So basically what this
+# line does is tell 'distcheck' to shut up and ignore those two files.
+distcleancheck_listfiles = find -type f -exec sh -c '[ {} == "package_revision.txt" ] || [ {} == "package_full_revision_dist.txt" ] || echo {}' ';'
+
 # automake doesn't build html docs
 
 CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" -a -f ./monotone.texi ]