aboutsummaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-05-28 04:37:34 +0000
committerRoger Dingledine <arma@torproject.org>2008-05-28 04:37:34 +0000
commit7f61dafe8dcee4501189aa09130fb9c772e534dd (patch)
tree8a260cfb057b31bf08f6816ec8acd8b054168070 /src/config
parent60ca544578273f41f399e68b132605fd26bd32b6 (diff)
downloadtor-7f61dafe8dcee4501189aa09130fb9c772e534dd.tar
tor-7f61dafe8dcee4501189aa09130fb9c772e534dd.tar.gz
include the geoip file in the tarball, and load it by default
when tor starts. this breaks rpms and maybe other packages. svn:r14764
Diffstat (limited to 'src/config')
-rw-r--r--src/config/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 07e7cf26a..21fba9177 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -1,11 +1,12 @@
confdir = $(sysconfdir)/tor
-#EXTRA_DIST = fallback-consensus
+EXTRA_DIST = fallback-consensus geoip
conf_DATA = torrc.sample
-#data_DATA = fallback-consensus
+data_DATA = fallback-consensus geoip
# If we don't have it, fake it.
fallback-consensus:
touch fallback-consensus
+