From ba95acb21e2f1eff8fe69d0cc09cd1c21434feaf Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 28 Apr 2011 20:45:20 +0000
Subject: Support parallel installation of different major versions

git-svn-id: http://svn.drobilla.net/sord/trunk@100 3d64ff67-21c5-427c-a301-fe4f08042e5a
---
 sord.pc.in |   6 +++---
 waf        | Bin 87718 -> 87343 bytes
 wscript    |  17 ++++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sord.pc.in b/sord.pc.in
index 981e3f8..4705fc3 100644
--- a/sord.pc.in
+++ b/sord.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libsord
+Name: Sord
 Version: @SORD_VERSION@
 Description: A lightweight C library for storing RDF statements in memory.
-Libs: -L${libdir} -lsord
-Cflags: -I${includedir}
+Libs: -L${libdir} -lsord-@SORD_MAJOR_VERSION@
+Cflags: -I${includedir}/sord-@SORD_MAJOR_VERSION@
diff --git a/waf b/waf
index 86ffb67..0b6e94c 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index d6c4340..af0c593 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,8 @@ from waflib.extras import autowaf as autowaf
 import waflib.Logs as Logs, waflib.Options as Options
 
 # Version of this package (even if built as a child)
-SORD_VERSION = '0.1.0'
+SORD_VERSION       = '0.2.0'
+SORD_MAJOR_VERSION = '0'
 
 # Library version (UNIX style major, minor, micro)
 # major increment <=> incompatible changes
@@ -39,8 +40,8 @@ def configure(conf):
     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB',
                       atleast_version='2.0.0', mandatory=True)
 
-    autowaf.check_pkg(conf, 'serd', uselib_store='SERD',
-                      atleast_version='0.1.0', mandatory=True)
+    autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+                      atleast_version='0.2.0', mandatory=True)
 
     conf.env['BUILD_TESTS'] = Options.options.build_tests
     conf.env['BUILD_UTILS'] = True
@@ -64,11 +65,13 @@ def configure(conf):
 
 def build(bld):
     # C/C++ Headers
-    bld.install_files('${INCLUDEDIR}/sord', bld.path.ant_glob('sord/*.h'))
-    bld.install_files('${INCLUDEDIR}/sord', bld.path.ant_glob('sord/*.hpp'))
+    includedir = '${INCLUDEDIR}/sord-%s/sord' % SORD_MAJOR_VERSION
+    bld.install_files(includedir, bld.path.ant_glob('sord/*.h'))
+    bld.install_files(includedir, bld.path.ant_glob('sord/*.hpp'))
 
     # Pkgconfig file
-    autowaf.build_pc(bld, 'SORD', SORD_VERSION, [])
+    autowaf.build_pc(bld, 'SORD', SORD_VERSION, SORD_MAJOR_VERSION, [],
+                     {'SORD_MAJOR_VERSION' : SORD_MAJOR_VERSION})
 
     # Library
     obj = bld(features        = 'c cshlib',
@@ -76,7 +79,7 @@ def build(bld):
               includes        = ['.', './src'],
               export_includes = ['.'],
               name            = 'libsord',
-              target          = 'sord',
+              target          = 'sord-%s' % SORD_MAJOR_VERSION,
               vnum            = SORD_LIB_VERSION,
               install_path    = '${LIBDIR}',
               libs            = [ 'm' ],
-- 
cgit v1.2.1