@@ -1,18 +1,22 @@
 import os
 import errno
 from glob import glob
-from os.path import dirname, basename, abspath, isdir
+from os.path import dirname, basename, abspath, isdir, join
 
 libs_root = dirname(abspath(__file__))
 
+# temporary workaround for broken clang 5.1 error: `unknown argument: '-mno-fused-madd'`
+quickfix = 'ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future'
+build_cmd = '%s python2.7 setup.py -q build'%quickfix
+
 def mkdirs(newdir, mode=0777):
     try: os.makedirs(newdir, mode)
     except OSError, err:
         # Reraise the error unless it's about an already existing directory
         if err.errno != errno.EEXIST or not isdir(newdir):
             raise
 
-def build_libraries():
+def build_libraries(dst_root):
     print "Compiling required c-extensions"
 
     # Store the current working directory for later.
@@ -21,25 +25,22 @@ def build_libraries():
     for setup_script in setup_scripts:
         lib_name = basename(dirname(setup_script))
         print "Building %s..."% lib_name
-        # run_setup gave some wonky errors, so we're defaulting to a simple os.system call.
         os.chdir(dirname(setup_script))
-        # temporary workaround for broken clang 5.1 error: `unknown argument: '-mno-fused-madd'`
-        cmd = ('ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future python2.7 setup.py -q build')
-        result = os.system(cmd)
+        result = os.system(build_cmd) # call the lib's setup.py
         if result > 0:
             raise OSError("Could not build %s" % lib_name)
         os.chdir(libs_root)
 
     # Make sure the destination folder exists.
-    mkdirs('../../build/deps')
+    mkdirs(dst_root)
 
     # Copy all build results to the ../../build/deps folder.
     build_dirs = glob("%s/*/build/lib*"%libs_root)
     for build_dir in build_dirs:
         lib_name = dirname(dirname(build_dir))
         # print "Copying", lib_name
-        cmd = 'cp -R -p %s/* ../../build/deps' % build_dir
-        # print cmd
+        cmd = 'cp -R -p %s/* %s' % (build_dir, dst_root)
+        print cmd
         result = os.system(cmd)
         if result > 0:
             raise OSError("Could not copy %s" % lib_name)
@@ -55,9 +56,13 @@ def clean_build_files():
 
 if __name__=='__main__':
     import sys
-    clean = len(sys.argv)>1 and sys.argv[1]=='clean'
 
-    if clean or os.environ.get('ACTION')=='clean':
-        clean_build_files()
+    if len(sys.argv)>1:
+        arg = sys.argv[1]
+        if os.path.exists(arg):
+            dst_root = join(arg, 'plotdevice/lib')
+            build_libraries(dst_root)
+        elif arg=='clean':
+            clean_build_files()
     else:
-        build_libraries()
+        print "usage: python build.py <destination-path>"
@@ -7,13 +7,13 @@
 lib_root = abspath(dirname(__file__))
 inplace = exists(join(lib_root, '../../app/main.m'))
 if inplace:
-    sys.path.append(join(lib_root, '../../build/ext'))
+    sys.path.append(join(lib_root, '../../build/lib/plotdevice/lib'))
 
 # test the sys.path by attempting to load the c-extensions
 try:
     import geometry, io, pathmatics
 except ImportError:
-    print "failed with path", sys.path
+    # print "failed with path", sys.path
     suggest = ' (try running `python setup.py build` before using the module from within the repository)'
     notfound = "Couldn't locate C extensions%s." % (suggest if inplace else '')
     raise RuntimeError(notfound)
 
@@ -156,16 +156,16 @@ class BuildCommand(build_py):
     def run(self):
         # first let the real build_py routine do its thing
         build_py.run(self)
+
         # then build the extensions
-        self.spawn(['/usr/bin/python', 'app/deps/buildlibs.py'])
+        self.spawn(['/usr/bin/python', 'app/deps/build.py', os.path.abspath(self.build_lib)])
 
         # include some ui resources for running a script from the command line
         rsrc_dir = '%s/plotdevice/rsrc'%self.build_lib
         self.mkpath(rsrc_dir)
         self.copy_file("app/Resources/colors.json", '%s/colors.json'%rsrc_dir)
         self.spawn(['/usr/bin/ibtool','--compile', '%s/viewer.nib'%rsrc_dir, "app/Resources/English.lproj/PlotDeviceScript.xib"])
         self.copy_file("app/Resources/PlotDeviceFile.icns", '%s/viewer.icns'%rsrc_dir)
-        self.spawn(['/usr/bin/ditto', 'build/deps', '%s/plotdevice/lib'%self.build_lib])
 
 
 if BUILD_APP:
@@ -195,20 +195,17 @@ def run(self):
             RSRC = self.resdir
             BIN = join(dirname(RSRC), 'SharedSupport')
             MODULE = join(self.bdist_base, 'lib/plotdevice')
-            EGG = join(RSRC, 'lib/python2.7/site-packages.zip')
             PY = join(RSRC, 'python')
             for pth in BIN, PY:
                 self.mkpath(pth)
 
             # unpack the zipped up pyc files and merge with the module sources
-            self.spawn(['unzip', '-q', EGG, '-d', PY])
             self.spawn(['/usr/bin/ditto', MODULE, join(PY, 'plotdevice')])
 
             # discard the eggery-pokery
             remove_tree(join(RSRC,'lib'), dry_run=self.dry_run)
             os.unlink(join(RSRC,'include'))
             os.unlink(join(RSRC,'site.pyc'))
-            os.unlink(join(PY,'test.pyc'))
 
             # place the command line tool in SharedSupport
             self.copy_file("%s/app/plotdevice"%TOP, BIN)