From f9592fe703f46515b2732d21f8e399e2db8e6e6f Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 15 Oct 2007 19:57:33 +0100 Subject: [PATCH] auto link libao driver Organization: Straylight/Edgeware From: Richard Kettlewell --- README | 5 ----- configure.ac | 2 ++ driver/Makefile.am | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/README b/README index 89cb90f..5be8716 100644 --- a/README +++ b/README @@ -94,11 +94,6 @@ NOTE: If you are upgrading from an earlier version, see README.upgrades. install -m 755 clients/disorder.cgi /usr/local/lib/cgi-bin/disorder - Depending on how your system is configured you may need to link the disorder - libao driver into the right directory: - - ln -s /usr/local/lib/ao/plugins-2/libdisorder.so /usr/lib/ao/plugins-2/. - 3. Create a 'jukebox' user and group, with the jukebox group being the default group of the jukebox user. The server will run as this user and group. Check that this user can read your music files and write to the audio diff --git a/configure.ac b/configure.ac index 6b6236b..a68598a 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,7 @@ if test "x$FINK" != xnone; then AC_CACHE_CHECK([fink install directory],[rjk_cv_finkprefix],[ rjk_cv_finkprefix="`echo "$FINK" | sed 's,/bin/fink$,,'`" ]) + finkdir="${rjk_cv_finkprefix}" finkbindir="${rjk_cv_finkprefix}/bin" CPPFLAGS="${CPPFLAGS} -I${rjk_cv_finkprefix}/include/gc -I${rjk_cv_finkprefix}/include" if test $want_server = yes; then @@ -145,6 +146,7 @@ if test "x$FINK" != xnone; then else finkbindir="" fi +AC_SUBST([finkdir]) AC_SUBST([finkbindir]) # Checks for libraries. diff --git a/driver/Makefile.am b/driver/Makefile.am index c0f1ba1..64da99d 100644 --- a/driver/Makefile.am +++ b/driver/Makefile.am @@ -21,8 +21,27 @@ aolib_LTLIBRARIES=libdisorder.la aolibdir=${libdir}/ao/plugins-2 +finkaolibdir=${finkdir}/lib/ao/plugins-2 +usraolibdir=/usr/lib/ao/plugins-2 AM_CPPFLAGS=-I${top_srcdir}/lib libdisorder_la_SOURCES=disorder.c libdisorder_la_LDFLAGS=-module +# Link ao driver into right location. If you have some other location then +# you'll need to modify this or link it manually. +install-data-hook: + @if test -d ${DESTDIR}${finkaolibdir} \ + && test ${finkaolibdir} != ${aolibdir}; then \ + echo rm -f ${DESTDIR}${finkaolibdir}/libdisorder.*; \ + rm -f ${DESTDIR}${finkaolibdir}/libdisorder.*; \ + echo ln ${aolibdir}/libdisorder.* ${DESTDIR}${finkaolibdir}; \ + ln ${DESTDIR}${aolibdir}/libdisorder.* ${DESTDIR}${finkaolibdir}; \ + fi + @if test -d ${DESTDIR}${usraolibdir} \ + && test ${usraolibdir} != ${aolibdir}; then \ + echo rm -f ${DESTDIR}${usraolibdir}/libdisorder.*; \ + rm -f ${DESTDIR}${usraolibdir}/libdisorder.*; \ + echo ln ${DESTDIR}${aolibdir}/libdisorder.* ${DESTDIR}${usraolibdir}; \ + ln ${DESTDIR}${aolibdir}/libdisorder.* ${DESTDIR}${usraolibdir}; \ + fi -- [mdw]