aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-10-01 00:01:08 -0400
committerNick Mathewson <nickm@torproject.org>2010-10-01 00:01:08 -0400
commit92640aa57813c26e8f39b9336b8715505ca9a271 (patch)
tree668d4e83268a5d5340b14099a88e9e93414fed7c /Makefile.am
parent1b2120654ce3aa34738ad33572eb15b9e220e435 (diff)
downloadtor-92640aa57813c26e8f39b9336b8715505ca9a271.tar
tor-92640aa57813c26e8f39b9336b8715505ca9a271.tar.gz
The build stuff for tor-fw-helper means we need automake 1.6 or later
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index b7b9737bd..5caae4cdc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,9 @@
# Copyright (c) 2007-2010, The Tor Project, Inc.
# See LICENSE for licensing information
-AUTOMAKE_OPTIONS = foreign
- # else it keeps trying to put COPYING back in
+# "foreign" means we don't follow GNU package layout standards
+# 1.6 means we require automake vesion 1.6
+AUTOMAKE_OPTIONS = foreign 1.6
SUBDIRS = src doc contrib