auto link libao driver

diff --git a/README b/README
index 89cb90f49893fc189031cba22dd8eabeb11c939e..5be87163166ca66028d7c1f85ea6feecf378a2ac 100644 (file)
--- 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 6b6236b8fed663dc14e04eae1da321c92dfb9653..a68598a66ccdeb61ee656bc8dec19778652635cb 100644 (file)
--- 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 c0f1ba1ecde8e85fb66a9200b2b86df2ef9c24fb..64da99d56144e1ef93a5e1ff412c4f33d1dc55be 100644 (file)
--- 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