From 2eac2abb75d80c4b0764eb874405d756c411aa94 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Tue, 21 Apr 2009 21:11:53 +0000
Subject: Update hubbub for the new shared object naming

svn path=/trunk/hubbub/; revision=7206
---
 Makefile        | 8 ++++----
 libhubbub.pc.in | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6410bc6..5944917 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,10 @@ endif
 # Parserutils
 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
   ifneq ($(PKGCONFIG),)
-    CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils-0 --cflags)
-    LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils-0 --libs)
+    CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
+    LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
   else
-    CFLAGS := $(CFLAGS) -I$(PREFIX)/include/parserutils0
+    CFLAGS := $(CFLAGS) -I$(PREFIX)/include
     LDFLAGS := $(LDFLAGS) -lparserutils0
   endif
 endif
@@ -56,7 +56,7 @@ ifeq ($(WANT_TEST),yes)
 endif
 
 # Extra installation rules
-I := /include/hubbub$(major-version)/hubbub
+I := /include/hubbub
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h
diff --git a/libhubbub.pc.in b/libhubbub.pc.in
index 3cdb0f0..8da88a5 100644
--- a/libhubbub.pc.in
+++ b/libhubbub.pc.in
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: libhubbub
 Description: HTML5 parsing library
 Version: VERSION
-Requires: libparserutils-0
-Libs: -L${libdir} -lhubbubMAJOR
-Cflags: -I${includedir}/hubbubMAJOR
+Requires: libparserutils
+Libs: -L${libdir} -lhubbub
+Cflags: -I${includedir}
-- 
cgit v1.2.3