[or-cvs] [tor/master 1/3] Ship the asciidoc-helper file in our tarballs

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sat, 27 Feb 2010 16:27:44 +0100
Subject: Ship the asciidoc-helper file in our tarballs
Commit: f9de12b864cc2b2fd5c3327f9dccf16deeefb483

Otherwise, the build process breaks when one of the .1.txt gets
a new mtime. Suggested by weasel.
---
 ChangeLog       |    3 +++
 doc/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab11ddb..7ee0ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@ Changes in version 0.2.2.10-alpha - 2010-??-??
       fixes bug 1255.
     - Disallow values larger than INT32_MAX for PerConnBWRate|Burst
       config option. Bugfix on 0.2.2.7-alpha.
+    - Ship the asciidoc-helper file in the tarball, so that people can
+      build from source if they want to, and touching the .1.txt files
+      doesn't break the build. Bugfix on 0.2.2.9-alpha.
 
   o Code simplifications and refactoring:
     - Fix some urls in the exit notice file and make it XHTML1.1 strict
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 492dd3b..cccc948 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,7 @@ html_in = $(asciidoc_files:=.html.in)
 
 man_in = $(asciidoc_files:=.1.in)
 
-EXTRA_DIST = HACKING                                         \
+EXTRA_DIST = HACKING asciidoc-helper.sh                      \
              $(html_in) $(man_in) $(asciidoc_files:=.1.txt)  \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
              tor-win32-mingw-creation.txt
-- 
1.6.5