diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 2b146685ee07a335934301ebf65c30b0ddcf237e..8ea46baa20c58530f23655ea5e79219ee206178f 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 408d9a68e0d9a418f20af4bc6b8b24bf00bc5742..b1bc9a5c11b88bb2d152e862d90c89dba4e5a6d8 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 09d7bd659f7c9f460d95dcc9847272f0061008fb..7bc99b89ca23aaf875c4406ff6445738cea1fc8b 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 +