diff options
author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-10 18:10:46 +0000 |
---|---|---|
committer | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-10 18:10:46 +0000 |
commit | ce83fc29a8a592f732e58559b1ac85f5929bfd7a (patch) | |
tree | 45267de183222dfbad91ac897e5873b0dff38add | |
parent | 974ce3392375245be7f391aeb3946d63485b7a0a (diff) | |
parent | 9effaed07d64c0277385b7f62859228e57e5e007 (diff) |
Merge branch 'master' of git+ssh://git.collabora.co.uk/git/telepathy-logger
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | telepathy-logger/libtelepathy-logger-uninstalled.pc.in | 11 | ||||
-rw-r--r-- | telepathy-logger/libtelepathy-logger.pc.in | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index ad29120ef..34330c8df 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ data/*.client telepathy-logger/dbus-service-client.h telepathy-logger/dbus-service-server.h telepathy-logger/libtelepathy-logger.pc +telepathy-logger/libtelepathy-logger-uninstalled.pc extensions/_gen/ extensions/extensions.html diff --git a/configure.ac b/configure.ac index cdc090e63..352362bc1 100644 --- a/configure.ac +++ b/configure.ac @@ -224,6 +224,7 @@ AC_OUTPUT([ src/Makefile telepathy-logger/Makefile telepathy-logger/libtelepathy-logger.pc + telepathy-logger/libtelepathy-logger-uninstalled.pc tools/Makefile tests/Makefile tests/suppressions/Makefile diff --git a/telepathy-logger/libtelepathy-logger-uninstalled.pc.in b/telepathy-logger/libtelepathy-logger-uninstalled.pc.in new file mode 100644 index 000000000..35965ed86 --- /dev/null +++ b/telepathy-logger/libtelepathy-logger-uninstalled.pc.in @@ -0,0 +1,11 @@ +prefix= +exec_prefix= +abs_top_srcdir=@abs_top_srcdir@ +abs_top_builddir=@abs_top_builddir@ + +Name: Telepathy Logger library (uninstalled copy) +Description: Access to Telepathy logs +Requires: telepathy-glib libxml-2.0 +Version: @VERSION@ +Libs: ${abs_top_builddir}/telepathy-logger/libtelepathy-logger.la +Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} diff --git a/telepathy-logger/libtelepathy-logger.pc.in b/telepathy-logger/libtelepathy-logger.pc.in index c11a59f7c..b2c96748f 100644 --- a/telepathy-logger/libtelepathy-logger.pc.in +++ b/telepathy-logger/libtelepathy-logger.pc.in @@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/telepathy-logger -Name: something -Description: Telepathy Logger library +Name: Telepathy Logger library +Description: Access to Telepathy logs Requires: telepathy-glib libxml-2.0 Version: @VERSION@ Libs: -L${libdir} -llibtelepathy-logger |