diff --git a/config/wscript b/config/wscript
index 5b0013c2..49de9829 100644
--- a/config/wscript
+++ b/config/wscript
@@ -2,28 +2,25 @@
 # encoding: utf-8
 
 def configure(ctx):
-    # Nuke the zcm.pc in build/ to ensure it's correct after a build
-    # We need to do this because we're generating the file with the substring tool
-    # And waf is not treating Environment Vars as a dependency for the file
-    ctx.exec_command('rm -f ' + ctx.path.get_bld().abspath() + '/zcm.pc')
+    pass
 
 def build(ctx):
     ctx(features="subst",
         source="zcm.pc.in",
         target="zcm.pc",
         install_path="${LIBDIR}/pkgconfig",
-        always=True)
+        PREFIX = ctx.env.PREFIX)
 
     if ctx.env.USING_ELF:
         ctx(features="subst",
             source="zcm-tools-util.pc.in",
             target="zcm-tools-util.pc",
             install_path="${LIBDIR}/pkgconfig",
-            always=True)
+            PREFIX = ctx.env.PREFIX)
 
     if ctx.env.USING_JAVA:
         ctx(features="subst",
             source="zcm-tools.pc.in",
             target="zcm-tools.pc",
             install_path="${LIBDIR}/pkgconfig",
-            always=True)
+            PREFIX = ctx.env.PREFIX)
diff --git a/config/zcm.pc.in b/config/zcm.pc.in
index d877c287..126b7696 100644
--- a/config/zcm.pc.in
+++ b/config/zcm.pc.in
@@ -1,4 +1,4 @@
-prefix=@prefix@
+prefix=@PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 libdir64=${exec_prefix}/lib64
diff --git a/waftools/strip_on_install.py b/waftools/strip_on_install.py
index 9990b814..ced2a54a 100644
--- a/waftools/strip_on_install.py
+++ b/waftools/strip_on_install.py
@@ -12,9 +12,8 @@ def copy_fun(self, src, tgt):
                 tgt = '\\\\?\\' + tgt
         shutil.copy2(src, tgt)
         os.chmod(tgt, self.chmod)
-
+        striptool = os.environ.get('STRIP_TOOL', 'strip')
         if getattr(self.generator, 'link_task', None):
                 if self.generator.link_task.outputs[0] in self.inputs:
-                        self.generator.bld.cmd_and_log('strip %s' % tgt, quiet=Context.BOTH)
+                        self.generator.bld.cmd_and_log('%s %s' % (striptool, tgt), quiet=Context.BOTH)
 Build.inst.copy_fun = copy_fun
-
diff --git a/wscript b/wscript
index ea9b5861..6d548ccf 100644
--- a/wscript
+++ b/wscript
@@ -405,7 +405,7 @@ def setup_environment(ctx):
         ctx.env.CXXFLAGS_default.append('-march=%s' % ctx.env.MARCH)
 
     ctx.env.INCLUDES_default  = [ctx.path.abspath()]
-    ctx.env.LIB_default       = ['rt']
+    ctx.env.LIB_default       = ['rt'] if ctx.env.USING_IPCSHM else []
     ctx.env.LINKFLAGS_default = ['-pthread']
 
     ctx.env.DEFINES_default   = ['_LARGEFILE_SOURCE', '_FILE_OFFSET_BITS=64']