2 files changed, 6 insertions, 6 deletions
diff --git a/sord.pc.in b/sord.pc.in
index 890a4cb..c28b1a1 100644
--- a/sord.pc.in
+++ b/sord.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: Sord
 Version: @SORD_VERSION@
 Description: A lightweight C library for storing RDF statements in memory.
-Libs: @SORD_LIBS@ @SERD_LIBS@
-Cflags: @SORD_CFLAGS@ @SERD_CFLAGS@
+Libs: -L@LIBPATH_SERD@ -l@LIB_SERD@ -L@LIBPATH_SORD@ -l@LIB_SORD@
+Cflags: -I@INCLUDES_SERD@ -I@INCLUDES_SORD@
diff --git a/wscript b/wscript
index d495290..e92dbce 100644
--- a/wscript
+++ b/wscript
@@ -59,10 +59,10 @@ def configure(conf):
     autowaf.define(conf, 'SORD_VERSION', SORD_VERSION)
     conf.write_config_header('sord-config.h', remove=False)
 
-    conf.env['SORD_CFLAGS'] = '-I%s/sord-%s' % (
-        conf.env['INCLUDEDIR'], SORD_MAJOR_VERSION)
-    conf.env['SORD_LIBS'] = '-L%s -lsord-%s' % (
-        conf.env['LIBDIR'], SORD_MAJOR_VERSION)
+    conf.env['INCLUDES_SORD'] = ['%s/sord-%s' % (
+        conf.env['INCLUDEDIR'], SORD_MAJOR_VERSION)]
+    conf.env['LIBPATH_SORD'] = [conf.env['LIBDIR']]
+    conf.env['LIB_SORD'] = ['sord-%s' % SORD_MAJOR_VERSION];
 
     autowaf.display_msg(conf, "Utilities", bool(conf.env['BUILD_UTILS']))
     autowaf.display_msg(conf, "Unit tests", bool(conf.env['BUILD_TESTS']))