summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2010-02-16 11:55:28 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2010-02-16 11:55:28 +0100
commitb9bb78ac2bb37dbe3f295c5fd35a51fc4ca954a2 (patch)
tree34583a2eae37bad826c4c9d6343bbde06568739c
parent72bb220a6a02deb9d13183338e39b19c2e9782d1 (diff)
downloadupower-b9bb78ac2bb37dbe3f295c5fd35a51fc4ca954a2.tar.gz
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.
-rw-r--r--libupower-glib/Makefile.am2
-rw-r--r--upower-glib.pc.in4
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