From 113debfd0548296403017a3ed971330e18e69e5b Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Tue, 21 Apr 2009 23:06:41 +0000
Subject: Sync with core buildsystem changes

svn path=/trunk/dom/; revision=7225
---
 Makefile                 | 8 ++++----
 bindings/hubbub/Makefile | 9 ++++-----
 libdom.pc.in             | 4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index bde257d..ac7e503 100644
--- a/Makefile
+++ b/Makefile
@@ -20,16 +20,16 @@ include build/makefiles/Makefile.top
 
 # Extra installation rules
 Is := include/dom
-I := /include/dom$(major-version)/dom
+I := /include/dom
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h
 
 Is := include/dom/bootstrap
-I := /include/dom$(major-version)/dom/bootstrap
+I := /include/dom/bootstrap
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/implpriv.h;$(Is)/implregistry.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/init_fini.h
 
 Is := include/dom/core
-I := /include/dom$(major-version)/dom/core
+I := /include/dom/core
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document.h;$(Is)/document_type.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/element.h;$(Is)/exceptions.h
@@ -46,6 +46,6 @@ ifeq ($(WITH_LIBXML_BINDING),yes)
 endif
 
 ifeq ($(WITH_HUBBUB_BINDING),yes)
-  REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub-0
+  REQUIRED_PKGS := $(REQUIRED_PKGS) libhubbub
 endif
 
diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile
index 20ced26..59b7d3b 100644
--- a/bindings/hubbub/Makefile
+++ b/bindings/hubbub/Makefile
@@ -5,12 +5,11 @@ ifeq ($(WITH_HUBBUB_BINDING),yes)
 
   # Hubbub
   ifneq ($(PKGCONFIG),)
-    CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --cflags)
-    LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub-0 --libs)
+    CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libhubbub --cflags)
+    LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libhubbub --libs)
   else
-    CFLAGS := $(CFLAGS) -I$(PREFIX)/include/hubbub0 \
-		-I$(PREFIX)/include/parserutils0
-    LDFLAGS := $(LDFLAGS) -lhubbub0 -lparserutils0
+    CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+    LDFLAGS := $(LDFLAGS) -lhubbub -lparserutils
   endif
 endif
 
diff --git a/libdom.pc.in b/libdom.pc.in
index 8b9bad1..60a1f62 100644
--- a/libdom.pc.in
+++ b/libdom.pc.in
@@ -7,5 +7,5 @@ Name: libdom
 Description: W3C DOM implementation
 Version: VERSION
 REQUIRED
-Libs: -L${libdir} -ldomMAJOR
-Cflags: -I${includedir}/domMAJOR
+Libs: -L${libdir} -ldom
+Cflags: -I${includedir}
-- 
cgit v1.2.3