2009-07-22 Mark Doffman <mark.doffman@codethink.co.uk>

        Update the pkgconfig and makefiles for the correct header paths.

diff --git a/dbind/Makefile.am b/dbind/Makefile.am
index e2c83b2..88bdaa4 100644 (file)
--- a/dbind/Makefile.am
+++ b/dbind/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
 libdbindinclude_HEADERS = \
        dbind-any.h \
        dbind.h
-libdbindincludedir=$(includedir)/dbind-$(DBIND_VERSION)
+libdbindincludedir=$(includedir)/dbind-$(DBIND_VERSION)/dbind
 
 libdbind_la_SOURCES = \
        dbind.c \

diff --git a/droute/Makefile.am b/droute/Makefile.am
index f8b7128..bc3c3bb 100644 (file)
--- a/droute/Makefile.am
+++ b/droute/Makefile.am
@@ -6,9 +6,9 @@ libdroute_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                       -I$(top_srcdir)
 
 libdrouteinclude_HEADERS = \
-               droute.h
+               droute.h   \
                droute-variant.h
-libdrouteincludedir=$(includedir)/droute-$(DROUTE_VERSION)
+libdrouteincludedir=$(includedir)/droute-$(DROUTE_VERSION)/droute
 
 libdroute_la_SOURCES =\
                droute.c\

diff --git a/pkgconfig/dbind-0.1-uninstalled.pc.in b/pkgconfig/dbind-0.1-uninstalled.pc.in
index 8eedc1f..9230b8b 100644 (file)
--- a/pkgconfig/dbind-0.1-uninstalled.pc.in
+++ b/pkgconfig/dbind-0.1-uninstalled.pc.in
@@ -2,7 +2,7 @@ top_builddir=@top_builddir@
 
 Name: dbind (Uninstalled)
 Description: Client side bindings helper library for libdbus
-Requires: libdbus-1.0
+Requires: dbus-1
 Version: @DBIND_VERSION@
 Libs: ${top_builddir}/dbind/libdbind.la
 Cflags: -I${top_builddir} @DBUS_CFLAGS@

diff --git a/pkgconfig/dbind-0.1.pc.in b/pkgconfig/dbind-0.1.pc.in
index d26ae30..447f9c3 100644 (file)
--- a/pkgconfig/dbind-0.1.pc.in
+++ b/pkgconfig/dbind-0.1.pc.in
@@ -1,9 +1,11 @@
 prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
 includedir=@includedir@
 
 Name: dbind
 Description: Client side bindings helper library for libdbus
-Requires: libdbus-1.0
+Requires: dbus-1
 Version: @DBIND_VERSION@
-Libs: -ldbind
+Libs: -ldbind -L${libdir}
 Cflags: -I${includedir}/dbind-@DBIND_VERSION@ @DBUS_CFLAGS@

diff --git a/pkgconfig/droute-0.1-uninstalled.pc.in b/pkgconfig/droute-0.1-uninstalled.pc.in
index 825a142..9476dd8 100644 (file)
--- a/pkgconfig/droute-0.1-uninstalled.pc.in
+++ b/pkgconfig/droute-0.1-uninstalled.pc.in
@@ -2,7 +2,7 @@ top_builddir=@top_builddir@
 
 Name: droute (Uninstalled)
 Description: Server side bindings helper library for libdbus
-Requires: libdbus-1.0
+Requires: dbus-1
 Version: @DROUTE_VERSION@
 Libs: ${top_builddir}/droute/libdroute.la
 Cflags: -I${top_builddir} @DBUS_CFLAGS@

diff --git a/pkgconfig/droute-0.1.pc.in b/pkgconfig/droute-0.1.pc.in
index 0a69ab0..2ade022 100644 (file)
--- a/pkgconfig/droute-0.1.pc.in
+++ b/pkgconfig/droute-0.1.pc.in
@@ -1,9 +1,11 @@
 prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
 includedir=@includedir@
 
 Name: droute
 Description: Server side bindings helper library for libdbus
-Requires: libdbus-1.0
+Requires: dbus-1
 Version: @DROUTE_VERSION@
-Libs: -ldroute
+Libs: -ldroute -L${libdir}
 Cflags: -I${includedir}/droute-@DROUTE_VERSION@ @DBUS_CFLAGS@