3 files changed, 30 insertions, 21 deletions

diff --git a/src/context.c b/src/context.c
index d580260..a76bfb2 100644
--- a/src/context.c
+++ b/src/context.c
@@ -803,7 +803,7 @@ pycairo_select_font_face (PycairoContext *o, PyObject *args) {
     return NULL;
 
   cairo_select_font_face (o->ctx, utf8, slant, weight);
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   RETURN_NULL_IF_CAIRO_CONTEXT_ERROR(o->ctx);
   Py_RETURN_NONE;
 }
@@ -1112,7 +1112,7 @@ pycairo_show_text (PycairoContext *o, PyObject *args) {
   cairo_show_text (o->ctx, utf8);
   Py_END_ALLOW_THREADS;
 
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   RETURN_NULL_IF_CAIRO_CONTEXT_ERROR(o->ctx);
   Py_RETURN_NONE;
 }
@@ -1152,7 +1152,7 @@ pycairo_text_extents (PycairoContext *o, PyObject *args) {
     return NULL;
 
   cairo_text_extents (o->ctx, utf8, &extents);
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   RETURN_NULL_IF_CAIRO_CONTEXT_ERROR(o->ctx);
   return Py_BuildValue("(dddddd)", extents.x_bearing, extents.y_bearing,
 		       extents.width, extents.height, extents.x_advance,
@@ -1167,7 +1167,7 @@ pycairo_text_path (PycairoContext *o, PyObject *args) {
     return NULL;
 
   cairo_text_path (o->ctx, utf8);
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   RETURN_NULL_IF_CAIRO_CONTEXT_ERROR(o->ctx);
   Py_RETURN_NONE;
 }
diff --git a/src/font.c b/src/font.c
index 711076c..ab39133 100644
--- a/src/font.c
+++ b/src/font.c
@@ -159,7 +159,7 @@ toy_font_face_new (PyTypeObject *type, PyObject *args, PyObject *kwds) {
 
   PyObject *o = PycairoFontFace_FromFontFace (
 		     cairo_toy_font_face_create (utf8, slant, weight));
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   return o;
 }
 
@@ -318,7 +318,7 @@ scaled_font_text_extents (PycairoScaledFont *o, PyObject *args) {
     return NULL;
 
   cairo_scaled_font_text_extents (o->scaled_font, utf8, &extents);
-  PyMem_Free(utf8);
+  PyMem_Free((void *)utf8);
   RETURN_NULL_IF_CAIRO_SCALED_FONT_ERROR(o->scaled_font);
   return Py_BuildValue("(dddddd)", extents.x_bearing, extents.y_bearing,
 		       extents.width, extents.height, extents.x_advance,
diff --git a/src/wscript b/src/wscript
index 0680c1c..9994780 100644
--- a/src/wscript
+++ b/src/wscript
@@ -5,28 +5,37 @@ import os
 
 d = 'src'
 
-def build(bld):
-  print('  %s/build' %d)
-
+def build(ctx):
+  print('  %s/build()' %d)
+  pycairoLibDir = os.path.join(ctx.env['LIBDIR'],
+                               'python'+ctx.env['PYTHON_VERSION'],
+                               'site-packages', 'cairo')
   # .py files
-  bld.new_task_gen(
-    features = 'py',
-    source = '__init__.py',
-    install_path = '${PYTHONDIR}/cairo',
+  ctx.new_task_gen(
+    features     = 'py',
+    source       = '__init__.py',
+    install_path = pycairoLibDir,
     )
 
   # C extension module
-  bld.new_task_gen(
-    features = 'cc cshlib pyext',
-    source = 'cairomodule.c context.c font.c path.c pattern.c matrix.c surface.c',
-    target = '_cairo',
-    includes = '.',
-    uselib = 'CAIRO',
-    install_path = '${PYTHONDIR}/cairo',
+  ctx.new_task_gen(
+    features     = 'cc cshlib pyext',
+    source       = ['cairomodule.c',
+                    'context.c',
+                    'font.c',
+                    'path.c',
+                    'pattern.c',
+                    'matrix.c',
+                    'surface.c',
+                    ],
+    target       = '_cairo',
+    includes     = '.',
+    uselib       = 'CAIRO',
+    install_path = pycairoLibDir,
     )
 
   # C API
-  bld.install_files(os.path.join(bld.env['PREFIX'], 'include', 'pycairo'),
+  ctx.install_files(os.path.join(ctx.env['PREFIX'], 'include', 'pycairo'),
                     'pycairo.h')
 
   # how to strip binaries ?