summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2009-04-21 21:11:53 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2009-04-21 21:11:53 (GMT)
commit2eac2abb75d80c4b0764eb874405d756c411aa94 (patch)
tree00c1fdbd0d773d281cd91959ed3f1c858960e077
parentd954d8d0356f426affc67441556f16393be3c2f5 (diff)
downloadlibhubbub-2eac2abb75d80c4b0764eb874405d756c411aa94.tar.gz
libhubbub-2eac2abb75d80c4b0764eb874405d756c411aa94.tar.bz2
Update hubbub for the new shared object naming
svn path=/trunk/hubbub/; revision=7206
-rw-r--r--Makefile8
-rw-r--r--libhubbub.pc.in6
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}