More API version fixes.

diff --git a/src/wscript b/src/wscript
index 29b4fd9b8b7d296b26d0099be83fac6905b9abe8..a1b9a11df7cc27a28836f5419f99de55607ff507 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -6,8 +6,8 @@ def build(bld):
     else:
         obj = bld(features='cxx cxxshlib')
 
-    obj.name = 'libsub-1.0'
-    obj.target = 'sub-1.0'
+    obj.name = 'libsub%s' % bld.env.API_VERSION
+    obj.target = 'sub%s' % bld.env.API_VERSION
     obj.uselib = 'CXML DCP BOOST_FILESYSTEM BOOST_LOCALE'
     obj.export_includes = ['.']
     obj.source = """
@@ -54,6 +54,6 @@ def build(bld):
               vertical_reference.h
               """
 
-    bld.install_files('${PREFIX}/include/libsub-1.0', headers)
+    bld.install_files('${PREFIX}/include/libsub%s/sub' % bld.env.API_VERSION, headers)
     if bld.env.STATIC:
-        bld.install_files('${PREFIX}/lib', 'libsub-1.0.a')
+        bld.install_files('${PREFIX}/lib', 'libsub%s.a' % bld.env.API_VERSION)

diff --git a/wscript b/wscript
index 5db98651d71648fc4f3ab9e6623bc7eb8cc92684..95050de002055966b9c48a28e0d7ef2002a32cdc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,6 +3,7 @@ import os
 
 APPNAME = 'libsub'
 VERSION = '1.0.0devel'
+API_VERSION = '-1.0'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -20,6 +21,7 @@ def configure(conf):
     conf.env.STATIC = conf.options.static
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_TESTS = conf.options.disable_tests
+    conf.env.API_VERSION = API_VERSION
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', '-g')
@@ -85,9 +87,9 @@ def build(bld):
     else:
         boost_lib_suffix = ''
 
-    bld(source='libsub-1.0.pc.in',
+    bld(source='libsub%s.pc.in' % bld.env.API_VERSION,
         version=VERSION,
-        includedir='%s/include/libsub-1.0' % bld.env.PREFIX,
+        includedir='%s/include/libsub%s' % (bld.env.PREFIX, bld.env.API_VERSION),
         libs="-L${libdir} -lsub -lboost_system%s" % boost_lib_suffix,
         install_path='${LIBDIR}/pkgconfig')