diff options
author | Mukund Sivaraman <muks@banu.com> | 2009-09-20 12:33:47 +0530 |
---|---|---|
committer | Mukund Sivaraman <muks@banu.com> | 2009-09-20 12:33:47 +0530 |
commit | 90e7d07f447f3abeb60720529d2b12ee91c4926e (patch) | |
tree | 12014b44d3c1834c9bdd5753f30b59891a1ad469 /src | |
parent | 6f9fa5287f169cd86277d2c41d20dbaa18e9cf19 (diff) | |
download | tinyproxy-90e7d07f447f3abeb60720529d2b12ee91c4926e.tar.gz tinyproxy-90e7d07f447f3abeb60720529d2b12ee91c4926e.zip |
Remove ability to change the name of the default configuration file
This feature will only confuse us during support, if users come to
us with a Tinyproxy build which has a differently named default config
file. This feature is not that useful anyway.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/main.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2d11ddc..05b5bb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,9 @@ sbin_PROGRAMS = tinyproxy +AM_CPPFLAGS = \ + -DSYSCONFDIR=\"${sysconfdir}\" + tinyproxy_SOURCES = \ acl.c acl.h \ anonymous.c anonymous.h \ @@ -287,7 +287,7 @@ main (int argc, char **argv) */ umask (0177); - config.config_file = DEFAULT_CONF_FILE; + config.config_file = SYSCONFDIR "/tinyproxy.conf"; config.godaemon = TRUE; process_cmdline (argc, argv); |