Note that Tor requires Automake 1.7. Fixes bug 2305

diff --git a/Makefile.am b/Makefile.am
index 4ded744fdec7fe57c67b492722ed50de473d9cce..bcb81e64f25d71043bb2e9a4103e5c244eabcd43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 # Copyright (c) 2007-2011, The Tor Project, Inc.
 # See LICENSE for licensing information
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.7
  # else it keeps trying to put COPYING back in
 
 SUBDIRS = src doc contrib

diff --git a/changes/bug2305 b/changes/bug2305
new file mode 100644 (file)
index 0000000..c979d5f
--- /dev/null
+++ b/changes/bug2305
@@ -0,0 +1,5 @@
+  o Build changes
+    - Tor does not build packages correctly with Automake 1.6 and earlier;
+      added a check to Makefile.am to make sure that we're building with
+      Automake 1.7 or later.
+