diff options
| -rw-r--r-- | Makefile.am | 33 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 34 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 460f952..065df86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,23 @@ EXTRA_DIST = TODO SUBDIRS = src doc install-data-local: - mkdir -p @TINYPROXY_CONFIG_DIR@ - $(INSTALL) doc/tinyproxy.conf @TINYPROXY_CONFIG@-dist - test ! -f @TINYPROXY_CONFIG@ && $(INSTALL) doc/tinyproxy.conf @TINYPROXY_CONFIG@ - echo "" - echo "A configuration file has been copied to:" - echo "@TINYPROXY_CONFIG@-dist" - echo "You will need to rename this file to:" - echo "@TINYPROXY_CONFIG@" - echo "and modify the values to suit your local system." - echo "" - echo "All the configuration directives are commented in the file, so" - echo "you should not have any problems configuring your system." - echo ""
\ No newline at end of file + $(mkinstalldirs) $(DESTDIR)@TINYPROXY_CONFIG_DIR@ + $(INSTALL) -m 600 doc/tinyproxy.conf \ + $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist + test ! -f $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ \ + && $(INSTALL) -m 600 doc/tinyproxy.conf \ + $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ + @echo "" + @echo "A configuration file has been copied to:" + @echo "" + @echo "@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist" + @echo "" + @echo "You will need to rename this file to:" + @echo "" + @echo "@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@" + @echo "" + @echo "and modify the values to suit your local system." + @echo "" + @echo "All the configuration directives are commented in the file, so" + @echo "you should not have any problems configuring your system." + @echo ""
\ No newline at end of file diff --git a/configure.ac b/configure.ac index db5c810..008a672 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 2.24 2002-05-02 04:44:03 rjkaes Exp $ +dnl $Id: configure.ac,v 2.25 2002-05-02 17:35:27 rjkaes Exp $ dnl Devlopers, please strive to achieve this order: dnl @@ -46,20 +46,25 @@ AC_ARG_WITH(stathost, dnl Set the default configuration file location test "$prefix" = "NONE" && prefix=/usr/local -TINYPROXY_CONFIG_DIR=`eval echo $sysconfdir/tinyproxy` + +# If sysconfdir is /usr/etc, change it to /etc (since /usr/etc doesn't exist) +if [[ "/usr/etc" = `eval echo $sysconfdir` -a "/usr" = "$prefix" ]]; then + TINYPROXY_CONFIG_DIR="/etc/tinyproxy" +else + TINYPROXY_CONFIG_DIR=`eval echo $sysconfdir/tinyproxy` +fi AC_SUBST(TINYPROXY_CONFIG_DIR) AH_TEMPLATE([DEFAULT_CONF_FILE], - [This is the default location of the configuration file.]) + [This is the default file name for the configuration file.]) AC_ARG_WITH(config, [AC_HELP_STRING([--with-config=FILE], [Set the default location of the config file])], - [TINYPROXY_CONFIG="$withval"], - [TINYPROXY_CONFIG="$TINYPROXY_CONFIG_DIR/tinyproxy.conf"]) -AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "$TINYPROXY_CONFIG") -AC_SUBST(TINYPROXY_CONFIG) -# [AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "$withval")], -# [AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "/etc/tinyproxy/tinyproxy.conf")]) + [TINYPROXY_CONFIG_FILE="$withval"], + [TINYPROXY_CONFIG_FILE="tinyproxy.conf"]) +AC_DEFINE_UNQUOTED(DEFAULT_CONF_FILE, "$TINYPROXY_CONFIG_DIR/$TINYPROXY_CONFIG_FILE") +AC_SUBST(TINYPROXY_CONFIG_FILE) +AC_MSG_NOTICE([Default config location and file is: $TINYPROXY_CONFIG_DIR/$TINYPROXY_CONFIG_FILE]) dnl Add compiler-specific optimization flags AC_ARG_ENABLE(debug, |