aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-04-21 22:24:50 +0200
committerDavid Robillard <d@drobilla.net>2019-04-21 22:24:50 +0200
commit06ae97e32c7533999a009a6355379677bd2c2003 (patch)
tree9af1d2d69337a10bcdb16f6282f56e78557abb98
parentfb77d2cf1b038812055750c6dd653f99bd2b5e7c (diff)
downloadraul-06ae97e32c7533999a009a6355379677bd2c2003.tar.gz
raul-06ae97e32c7533999a009a6355379677bd2c2003.tar.bz2
raul-06ae97e32c7533999a009a6355379677bd2c2003.zip
Fix pkg-config file for versioned installation
-rw-r--r--raul.pc.in2
-rw-r--r--wscript12
2 files changed, 7 insertions, 7 deletions
diff --git a/raul.pc.in b/raul.pc.in
index dec7559..87510de 100644
--- a/raul.pc.in
+++ b/raul.pc.in
@@ -7,4 +7,4 @@ Name: raul
Version: @RAUL_VERSION@
Description: A C++ convenience library for realtime audio applications
Libs: @RAUL_PC_LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/raul-@RAUL_MAJOR_VERSION@
diff --git a/wscript b/wscript
index 3a11d25..a5e37a4 100644
--- a/wscript
+++ b/wscript
@@ -12,7 +12,7 @@ from waflib.extras import autowaf
# minor increment <=> compatible changes (additions)
# micro increment <=> no interface changes
RAUL_VERSION = '1.0.0'
-RAUL_MAJOR_VERSION = '0'
+RAUL_MAJOR_VERSION = '1'
# Mandatory waf variables
APPNAME = 'raul' # Package name for waf dist
@@ -63,11 +63,11 @@ def build(bld):
bld.install_files(includedir, bld.path.ant_glob('raul/*.h'))
# Pkgconfig file
- dict = {'RAUL_PC_LIBS': ' '}
- if bld.env.DEST_OS == 'darwin':
- dict = {'RAUL_PC_LIBS': '-framework CoreServices'}
- autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, '',
- 'GLIB GTHREAD', subst_dict=dict)
+ pc_libs = '-framework CoreServices' if bld.env.DEST_OS == 'darwin' else ''
+ pc_dict = {'RAUL_MAJOR_VERSION': RAUL_MAJOR_VERSION,
+ 'RAUL_PC_LIBS': pc_libs}
+ autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, RAUL_MAJOR_VERSION, [],
+ subst_dict=pc_dict)
framework = ''
if bld.env.DEST_OS == 'darwin':