From b9bb78ac2bb37dbe3f295c5fd35a51fc4ca954a2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 16 Feb 2010 11:55:28 +0100 Subject: [PATCH] Fix libupower-glib include dir and pkgconfig Install libupower-glib include files into libupower-glib/ (where upower.h expects them to be), not upower-glib. Now the library is consistently named "libupower-glib" everywhere. Also fix the Libs line in the pkgconfig file: link against -lupower-glib, not -lupower. --- libupower-glib/Makefile.am | 2 +- upower-glib.pc.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libupower-glib/Makefile.am b/libupower-glib/Makefile.am index 49edaad..c5b5c71 100644 --- a/libupower-glib/Makefile.am +++ b/libupower-glib/Makefile.am @@ -16,7 +16,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) lib_LTLIBRARIES = \ libupower-glib.la -libupower_glib_includedir = $(includedir)/upower-glib +libupower_glib_includedir = $(includedir)/libupower-glib libupower_glib_include_HEADERS = \ upower.h \ up-version.h \ diff --git a/upower-glib.pc.in b/upower-glib.pc.in index e648800..fad4c47 100644 --- a/upower-glib.pc.in +++ b/upower-glib.pc.in @@ -8,6 +8,6 @@ Description: UPower is a system daemon for managing power devices Version: @VERSION@ Requires.private: dbus-1, gthread-2.0 Requires: glib-2.0, gobject-2.0 -Libs: -L${libdir} -lupower -Cflags: -I${includedir}/upower-glib +Libs: -L${libdir} -lupower-glib +Cflags: -I${includedir}/libupower-glib