From 7522c47dc91e0f916c619793cc16c23d0cd97dc1 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 9 Nov 2009 15:41:51 -0500
Subject: [PATCH] [#2181] Install libdbus-c++ in $pkglib instead of $lib

ie in /usr/lib/sflphone for instance, instead of /usr/lib
---
 sflphone-common/configure.ac                  | 2 +-
 sflphone-common/globals.mak                   | 5 +++--
 sflphone-common/libs/dbus-c++/src/Makefile.am | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 2b146685ee..8ea46baa20 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
 dnl
 	dnl Process this file with autoconf to produce a configure script.
 	AC_PREREQ(2.59)
-	AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_INIT([sflphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
 	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index 408d9a68e0..b1bc9a5c11 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -1,7 +1,8 @@
 # Global variables
 src=$(top_srcdir)
-sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs
-sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
+sfllibdir=$(DESTDIR)$(libdir)/sflphone
+sflcodecdir=$(sfllibdir)/codecs
+sflplugindir=$(sfllibdir)/plugins
 
 ASTYLERC="../astylerc"
 indent="/usr/bin/astyle"
diff --git a/sflphone-common/libs/dbus-c++/src/Makefile.am b/sflphone-common/libs/dbus-c++/src/Makefile.am
index 09d7bd659f..7bc99b89ca 100644
--- a/sflphone-common/libs/dbus-c++/src/Makefile.am
+++ b/sflphone-common/libs/dbus-c++/src/Makefile.am
@@ -37,9 +37,10 @@ HEADER_FILES = \
 # noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
 noinst_HEADERS = $(HEADER_FILES)
 
-lib_LTLIBRARIES = libdbus-c++-1.la
+pkglib_LTLIBRARIES = libdbus-c++-1.la
 libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP)
 libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS)
 
 MAINTAINERCLEANFILES = \
 	Makefile.in
+
-- 
GitLab