fix default config file location, ticket #63

This commit is contained in:
Ron Pedde 2006-04-10 17:15:37 +00:00
parent d67da51dee
commit bc2faaf75f
2 changed files with 9 additions and 5 deletions

View File

@ -19,10 +19,14 @@ AC_CHECK_FUNCS(strptime)
AC_CHECK_FUNCS(strtok_r) AC_CHECK_FUNCS(strtok_r)
AM_CONDITIONAL(COND_REND_OSX,false) AM_CONDITIONAL(COND_REND_OSX,false)
if test "x$prefix" != xNONE; then if test "x$prefix" != xNONE -a "x$prefix" != "x/usr"; then
CONFFILE="$prefix/etc/mt-daapd.conf" CONFFILE="$prefix/etc/mt-daapd.conf"
else else
if test "x$prefix" == "xNONE"; then
CONFFILE="/usr/local/etc/mt-daapd.conf"
else
CONFFILE="/etc/mt-daapd.conf" CONFFILE="/etc/mt-daapd.conf"
fi
fi fi

View File

@ -8,7 +8,7 @@ bin_SCRIPTS=mt-daapd-ssc.sh
dbdir="/var/cache/mt-daapd" dbdir="/var/cache/mt-daapd"
mt-daapd.conf: mt-daapd.conf.templ mt-daapd.conf: mt-daapd.conf.templ ../config.h
if [ "$(prefix)" == "/usr" ]; then \ if [ "$(prefix)" == "/usr" ]; then \
sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g $< >$@; \ sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g $< >$@; \
else \ else \