From a54a65dfb68b41bf86c5d3e72f33beb6773c6983 Mon Sep 17 00:00:00 2001 From: Steven Hazel Date: Wed, 15 Oct 2003 07:19:38 +0000 Subject: - cause configure to create a tor.sh which will have directories set correctly based on how configure was run - cause tor to guess the location of torrc more intelligently - cause cause src/config/torrc and src/conf/sample-server-torrc to be generated with contents that are correct for the way configure was run - cause "make install" to put torrc, sample-server-torrc, and dirservers somewhere intelligent svn:r587 --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/or/config.c') diff --git a/src/or/config.c b/src/or/config.c index ae14d3bff..2402a64e9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -220,8 +220,8 @@ int getconfig(int argc, char **argv, or_options_t *options) { } if(i < argc-1) { /* we found one */ fname = argv[i+1]; - } else { /* didn't find one, try /etc/torrc */ - fname = "/etc/torrc"; + } else { /* didn't find one, try CONFDIR */ + fname = CONFDIR "/torrc"; } log(LOG_DEBUG,"Opening config file '%s'",fname); -- cgit v1.2.3