From 87890ea35e827b23daeb21028efca73f11f2d659 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 3 Apr 2009 01:34:02 +0000
Subject: Reflect shared library versioning

svn path=/trunk/libparserutils/; revision=7030
---
 Makefile             | 23 ++++++++++++++---------
 libparserutils.pc.in |  6 +++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index b17de12..3606b70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # Component settings
 COMPONENT := parserutils
+COMPONENT_VERSION := 0.0.1
 # Default to a static library
 COMPONENT_TYPE ?= lib-static
 
@@ -18,17 +19,21 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
 include build/makefiles/Makefile.top
 
 # Extra installation rules
-I := include/parserutils
-INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/errors.h;$(I)/functypes.h;$(I)/parserutils.h;$(I)/types.h
+Is := include/parserutils
+I := /include/parserutils$(major-version)/parserutils
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
 
-I := include/parserutils/charset
-INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/codec.h;$(I)/mibenum.h;$(I)/utf16.h;$(I)/utf8.h
+Is := include/parserutils/charset
+I := /include/parserutils$(major-version)/parserutils/charset
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
 
-I := include/parserutils/input
-INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/inputstream.h
+Is := include/parserutils/input
+I := /include/parserutils$(major-version)/parserutils/input
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
 
-I := include/parserutils/utils
-INSTALL_ITEMS := $(INSTALL_ITEMS) /$(I):$(I)/buffer.h;$(I)/stack.h;$(I)/vector.h
+Is := include/parserutils/utils
+I := /include/parserutils$(major-version)/parserutils/utils
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
 
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
+INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
diff --git a/libparserutils.pc.in b/libparserutils.pc.in
index 400ce78..19df9a2 100644
--- a/libparserutils.pc.in
+++ b/libparserutils.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: libparserutils
 Description: Utility library for facilitating parser development
-Version: 0.0.1
-Libs: -L${libdir} -lparserutils
-Cflags: -I${includedir}
+Version: VERSION
+Libs: -L${libdir} -lparserutilsMAJOR
+Cflags: -I${includedir}/parserutilsMAJOR
-- 
cgit v1.2.3