~ubuntu-desktop/libcanberra/karmic

Only ship fixes that do not depend on other commits that introduce code that
is not desired at this late stage in karmic

added added

removed removed

From 39e07bc4ae149089815ed3e4f6b614c8cb987309 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Sun, 20 Sep 2009 19:52:37 +0200

Subject: [PATCH 10/11] build-sys: fix module path

---

src/Makefile.am | 4 ++--

1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am

index 8da9334..b24d9fc 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -26,8 +26,8 @@ gnomeautostartdir = $(datadir)/gnome/autostart

gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow/

-#AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\"

-AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"/home/lennart/projects/libcanberra/src/.libs\"

+AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\"

+#AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"/home/lennart/projects/libcanberra/src/.libs\"

AM_CXXFLAGS = $(PTHREAD_CFLAGS)

AM_LDADD = $(PTHREAD_LIBS)

1.6.3.3