diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
| commit | 2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd (patch) | |
| tree | d6786b027903624576e2f8861a68e665d0fbbb9b /contrib/Makefile.am | |
| parent | a29596556c60fbbf687b1af48b9e6646b25f208e (diff) | |
| parent | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (diff) | |
| download | tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to 'contrib/Makefile.am')
| -rw-r--r-- | contrib/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d42e91ec9..5aae2c819 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = osx suse -DIST_SUBDIRS = osx suse +SUBDIRS = suse +DIST_SUBDIRS = suse confdir = $(sysconfdir)/tor |