=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-12-25 05:45:11 +0000
+++ mixxx/build/depends.py	2012-03-08 10:44:13 +0000
@@ -111,36 +111,30 @@
         build.env.Append(CPPDEFINES = ['QT_SHARED',
                                        'QT_TABLET_SUPPORT'])
 
+        qt_modules = [
+            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg', 
+            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtWebKit',
+            'QtNetwork'
+            #'QtUiTools', #'QtDesigner',
+        ]
+
         # Enable Qt include paths
         if build.platform_is_linux:
             if not conf.CheckForPKG('QtCore', '4.6'):
                 raise Exception('QT >= 4.6 not found')
 
-            #Try using David's qt4.py's Qt4-module finding thingy instead of pkg-config.
             #(This hopefully respects our qtdir=blah flag while linking now.)
-            build.env.EnableQt4Modules(['QtCore',
-                                        'QtGui',
-                                        'QtOpenGL',
-                                        'QtXml',
-                                        'QtSvg',
-                                        'QtSql',
-                                        'QtScript',
-                                        'QtXmlPatterns',
-                                        'QtWebKit'
-                                        #'QtUiTools',
-                                        #'QtDesigner',
-                                        ],
-                                       debug=False)
+            build.env.EnableQt4Modules(qt_modules,debug=False)
+
         elif build.platform_is_osx:
-            build.env.Append(LINKFLAGS = '-framework QtCore -framework QtOpenGL -framework QtGui -framework QtSql -framework QtXml -framework QtXmlPatterns  -framework QtNetwork -framework QtSql -framework QtScript -framework QtWebKit')
-            build.env.Append(CPPPATH = ['/Library/Frameworks/QtCore.framework/Headers/',
-                                        '/Library/Frameworks/QtOpenGL.framework/Headers/',
-                                        '/Library/Frameworks/QtGui.framework/Headers/',
-                                        '/Library/Frameworks/QtXml.framework/Headers/',
-                                        '/Library/Frameworks/QtNetwork.framework/Headers/',
-                                        '/Library/Frameworks/QtSql.framework/Headers/',
-                                        '/Library/Frameworks/QtWebKit.framework/Headers/',
-                                        '/Library/Frameworks/QtScript.framework/Headers/'])
+            qtdir = build.env['QTDIR']
+            build.env.Append(
+                LINKFLAGS=' '.join('-framework %s' % m for m in qt_modules)
+            )
+            build.env.Append(CPPPATH = [os.path.join(qtdir,'Frameworks','%s.framework' % m,'Headers') for m in qt_modules])
+            build.env.Append(LINKFLAGS = [
+                '-F%s' % os.path.join(build.env['QTDIR'],'Frameworks')
+            ])
 
         # Setup Qt library includes for non-OSX
         if build.platform_is_linux or build.platform_is_bsd:
@@ -633,16 +627,19 @@
 
         elif build.platform_is_osx:
             #Stuff you may have compiled by hand
-            build.env.Append(LIBPATH = ['/usr/local/lib'])
-            build.env.Append(CPPPATH = ['/usr/local/include'])
+            if os.path.isdir('/usr/local/include'):
+                build.env.Append(LIBPATH = ['/usr/local/lib'])
+                build.env.Append(CPPPATH = ['/usr/local/include'])
 
             #Non-standard libpaths for fink and certain (most?) darwin ports
-            build.env.Append(LIBPATH = ['/sw/lib'])
-            build.env.Append(CPPPATH = ['/sw/include'])
+            if os.path.isdir('/sw/include'):
+                build.env.Append(LIBPATH = ['/sw/lib'])
+                build.env.Append(CPPPATH = ['/sw/include'])
 
             #Non-standard libpaths for darwin ports
-            build.env.Append(LIBPATH = ['/opt/local/lib'])
-            build.env.Append(CPPPATH = ['/opt/local/include'])
+            if os.path.isdir('/opt/local/include'):
+                build.env.Append(LIBPATH = ['/opt/local/lib'])
+                build.env.Append(CPPPATH = ['/opt/local/include'])
 
         elif build.platform_is_bsd:
             build.env.Append(CPPDEFINES='__BSD__')

=== modified file 'mixxx/build/osx/otool.py'
--- mixxx/build/osx/otool.py	2011-12-23 23:00:28 +0000
+++ mixxx/build/osx/otool.py	2012-03-08 09:03:26 +0000
@@ -51,8 +51,15 @@
 SYSTEM_FRAMEWORKS = ["/System/Library/Frameworks"]
 SYSTEM_LIBPATH = ["/usr/lib"] #anything else?
 #paths to libs that we should copy in
-LOCAL_FRAMEWORKS = [os.path.expanduser("~/Library/Frameworks"), "/Library/Frameworks", "/Network/Library/Frameworks"]
-LOCAL_LIBPATH = ["/usr/local/lib", "/opt/local/lib", "/sw/local/lib"]
+LOCAL_FRAMEWORKS = [
+    os.path.expanduser("~/Library/Frameworks"), 
+    "/Library/Frameworks", 
+    "/Network/Library/Frameworks"
+]
+LOCAL_LIBPATH = filter(lambda x: 
+    os.path.isdir(x), 
+    ["/usr/local/lib", "/opt/local/lib", "/sw/local/lib"]
+)
 
 #however
 FRAMEWORKS = LOCAL_FRAMEWORKS + SYSTEM_FRAMEWORKS