Patch from Ian Burrell to move plugins from sysconfdit to libdir, as it Should Be

This commit is contained in:
Ron Pedde 2007-08-27 00:55:17 +00:00
parent 1ca5cef013
commit f2174b3173
4 changed files with 16 additions and 12 deletions

View File

@ -146,3 +146,6 @@ Gareth Potter
Anton Johansson Anton Johansson
* Swedish Translations * Swedish Translations
Iam Burrell
* configure patches to put plugins in libdir
* RH/Centos/Fedora specfiles

View File

@ -7,12 +7,13 @@ EXTRA_DIST = README mt-daapd.spec mt-daapd.conf.templ mt-daapd-ssc.sh mt-daapd-s
BUILT_SOURCES = mt-daapd.conf BUILT_SOURCES = mt-daapd.conf
bin_SCRIPTS = mt-daapd-ssc.sh bin_SCRIPTS = mt-daapd-ssc.sh
dbdir="/var/cache/mt-daapd" dbdir="$(localstatedir)/cache/mt-daapd"
mt-daapd.conf: mt-daapd.conf.templ ../config.h mt-daapd.conf: mt-daapd.conf.templ ../config.h
if [ "$(prefix)" = "/usr" ]; then \ sed -e s,[@]prefix[@],$(prefix), \
sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \ -e s,[@]sysconfdir[@],$(sysconfdir), \
else \ -e s,[@]libdir[@],$(libdir), \
sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],$(prefix)/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \ -e s,[@]dbdir[@],$(dbdir),g mt-daapd.conf.templ >$@
fi

View File

@ -114,7 +114,7 @@ runas = nobody
# below. # below.
# #
playlist = @prefix@/etc/mt-daapd.playlist playlist = @sysconfdir@/mt-daapd.playlist
# #
# password (optional) # password (optional)
@ -295,6 +295,6 @@ scan_type = 2
#compress = 0 #compress = 0
[plugins] [plugins]
plugin_dir = @prefix@/share/mt-daapd/plugins plugin_dir = @libdir@/mt-daapd/plugins

View File

@ -1,9 +1,9 @@
# $Id: $ # $Id: $
# #
rspdir = ${pkgdatadir}/plugins rspdir = ${pkglibdir}/plugins
out_daapdir = ${pkgdatadir}/plugins out_daapdir = ${pkglibdir}/plugins
ssc_ffmpegdir = ${pkgdatadir}/plugins ssc_ffmpegdir = ${pkglibdir}/plugins
ssc_scriptdir = ${pkgdatadir}/plugins ssc_scriptdir = ${pkglibdir}/plugins
rsp_LTLIBRARIES=rsp.la rsp_LTLIBRARIES=rsp.la
rsp_la_LDFLAGS=-module -avoid-version rsp_la_LDFLAGS=-module -avoid-version