From c808a6b8534700f526f6f40948eeb5aca5874869 Mon Sep 17 00:00:00 2001 From: Ron Pedde Date: Sun, 18 Jun 2006 04:54:13 +0000 Subject: [PATCH] Default to correct plugins, don't clobber existing config file --- contrib/Makefile.am | 11 ----------- contrib/mt-daapd.conf.templ | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f1fb85b0..f6161691 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = init.d EXTRA_DIST = README mt-daapd.spec mt-daapd.conf.templ mt-daapd-ssc.sh mt-daapd-ssc.pl BUILT_SOURCES = mt-daapd.conf -sysconf_DATA = mt-daapd.conf bin_SCRIPTS = mt-daapd-ssc.sh dbdir="/var/cache/mt-daapd" @@ -17,13 +16,3 @@ mt-daapd.conf: mt-daapd.conf.templ ../config.h sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],$(prefix)/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \ fi - - - - - - - - - - diff --git a/contrib/mt-daapd.conf.templ b/contrib/mt-daapd.conf.templ index 9988b081..04ee512d 100644 --- a/contrib/mt-daapd.conf.templ +++ b/contrib/mt-daapd.conf.templ @@ -311,3 +311,5 @@ scan_type = 2 [plugins] plugin_dir = @prefix@/share/mt-daapd/plugins +plugins = rsp.so,ssc-script.so +