Fixing the hildon dash.

diff --git a/configure.ac b/configure.ac
index 7fe89c5..003cb02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ CFLAGS="$CFLAGS -DMAEMO_CHANGES"
 # includes all the low-level flags
 # FIXME Add esd and gconf flags
 HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/src/"
-HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon_\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
+HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(PACKAGE_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`"
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 

diff --git a/debian/changelog b/debian/changelog
index ed44a09..c3f3e46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libhildon (0.9.9-8) unstable; urgency=low
+libhildon (0.9.9-9) unstable; urgency=low
 
   * Unreleased.
 

diff --git a/pkgconfig/hildon.pc.in b/pkgconfig/hildon.pc.in
index 0d15b96..006be4e 100644 (file)
--- a/pkgconfig/hildon.pc.in
+++ b/pkgconfig/hildon.pc.in
@@ -7,5 +7,5 @@ Name: hildon
 Description: Hildon widgets library
 Requires: gtk+-2.0 >= @GTK_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lhildon_@PACKAGE_VERSION_MAJOR@
+Libs: -L${libdir} -lhildon-@PACKAGE_VERSION_MAJOR@
 Cflags: -I${includedir} -DMAEMO_CHANGES

diff --git a/src/Makefile.am b/src/Makefile.am
index 7737ab4..c3109f9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ MAINTAINERCLEANFILES                                    = Makefile.in                                   \
 
 EXTRA_DIST                                             = hildon-marshalers.list
 
-lib_LTLIBRARIES                                        = libhildon_@PACKAGE_VERSION_MAJOR@.la
+lib_LTLIBRARIES                                        = libhildon-@PACKAGE_VERSION_MAJOR@.la
 
 libhildon_@PACKAGE_VERSION_MAJOR@_la_LDFLAGS           = $(HILDON_WIDGETS_LT_LDFLAGS)