sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

This commit is contained in:
Nick Mathewson 2011-01-03 17:24:32 -05:00
parent f089804332 e4320689cc
commit 0e9d7f105d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -3,7 +3,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

5
changes/bug2305 Normal file
View File

@ -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.