# 
# 
# patch "ChangeLog"
#  from [ace33c608b6e9043850886a1d31ed23075105539]
#    to [0621c8df5b36f3d1416b2d0ddd004314adc2bd69]
# 
# patch "Makefile.am"
#  from [774a13940ea68500012f0c157600405207ab4741]
#    to [ac345a2af81c3b439265ee192b8c22c60103e355]
# 
============================================================
--- ChangeLog	ace33c608b6e9043850886a1d31ed23075105539
+++ ChangeLog	0621c8df5b36f3d1416b2d0ddd004314adc2bd69
@@ -1,5 +1,11 @@
 2006-04-06  Nathaniel Smith  <address@hidden>
 
+	* Makefile.am (package_full_revision_*.txt): Try this again,
+	hopefully now 'distcheck' will work in a clean dir on systems that
+	have no mtn binary.
+
+2006-04-06  Nathaniel Smith  <address@hidden>
+
 	* UPGRADE: Expand and hopefully clarify 0.26 upgrading notes.
 	Also add a paragraph at the top to explain how the file is
 	organized (maybe this should have been there a long time ago...)
============================================================
--- Makefile.am	774a13940ea68500012f0c157600405207ab4741
+++ Makefile.am	ac345a2af81c3b439265ee192b8c22c60103e355
@@ -518,7 +518,7 @@
 #              |                \  <-- add "generated from cached data" text
 #              |      package_full_revision_dist.txt
 #              |           /        
-#          package_full_revision.txt   <-- or, "unknown" if neither exists
+#          package_full_revision.txt
 
 # This is phony, so that we always try to rebuild it.  If it succeeds
 # in calculating changes, it produces its target; otherwise, its
@@ -533,8 +533,12 @@
 	|| (cd $(srcdir) && mtn automate get_revision) 2>/dev/null >$@ \
 	|| rm -f $@
 # See above comment -- the file this depends on may or may not exist.
-# If it does, then we overwrite this file; if it doesn't, then we
-# leave this file alone.  (Possibly leaving it non-existent.)
+# This file, however, must always exist, so that 'make dist' can
+# include it in the tarball it generates.  So there are three cases:
+#   -- if the raw file does not exist, then
+#      -- if the dist file exists, then we leave it alone
+#      -- if the dist file does not exist, then we say "unknown"
+#   -- if the raw file does exist, then we regenerate the dist file
 package_full_revision_dist.txt: package_full_revision_raw.txt
 	if [ -f $< ]; then \
 	  cp -f $< $@ \
@@ -542,12 +546,12 @@
 	      echo '  Generated from data cached in the distribution;'; \
 	      echo '  further changes may have been made.') >> $@; \
 	fi
-# It is possible that neither of the files this depends on exactly
-# exist.  We use the first one that does.
+	[ -f $@ ] || echo "unknown" > $@
+# The raw file may not exist, but the dist file definitely does; we
+# just take the first dependency that exists.
 package_full_revision.txt: package_full_revision_raw.txt package_full_revision_dist.txt
 	rm -f $@
 	for SRC in $^; do ([ -f $$SRC -a ! -f $@ ] && cp -f $$SRC $@) || true; done
-	[ -f $@ ] || echo "unknown" > $@
 package_full_revision.c: package_full_revision.txt txt2c Makefile
 	./txt2c --no-static $< package_full_revision >address@hidden
 	cmp -s address@hidden $@ || mv -f address@hidden $@