# HG changeset patch
# User giacomo
# Date 1176565721 25200
# Node ID d7a6fd179cd2d8171242788d519a4d544347abd8
# Parent  ae7e96e44f22ed87c9767c13cd98f71f3489e318
[svn] - changed directory for amidi-plug backends

diff -r ae7e96e44f22 -r d7a6fd179cd2 ChangeLog
--- a/ChangeLog	Fri Apr 13 09:27:41 2007 -0700
+++ b/ChangeLog	Sat Apr 14 08:48:41 2007 -0700
@@ -1,3 +1,12 @@
+2007-04-13 16:27:41 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2040]
+  Now in sync with AdPlug upstream, merging their commit: "Removed superfluous exit() call. This was detected as part of a GCC 4.3
+  compilation regression test. Thanks to Martin Michlmayr! Fixes Debian bug
+  #417078."
+  trunk/src/adplug/core/rix.cxx |    6 ++++--
+  1 file changed, 4 insertions(+), 2 deletions(-)
+
+
 2007-04-13 16:09:50 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2038]
   Upstream commit "Vastly enhanced generic Protracker player and modified loaders accordingly.
diff -r ae7e96e44f22 -r d7a6fd179cd2 configure.ac
--- a/configure.ac	Fri Apr 13 09:27:41 2007 -0700
+++ b/configure.ac	Sat Apr 14 08:48:41 2007 -0700
@@ -889,7 +889,7 @@
   INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
   PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0],,)
   PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.6.0],,)
-  AMIDIPLUGBACKENDDIR=${libdir}/amidi-plug/audacious
+  AMIDIPLUGBACKENDDIR=${libdir}/audacious/amidi-plug
   AC_SUBST(AMIDIPLUGBACKENDDIR)
   if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
     if test "x$alsalib_available" = "xcheck"; then