X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9db15f1e92e3083ee36f16aa654fb8b09922c10..af86380553169606c985e0053a1630e9514e18b6:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 3b2de23850..dace5b5cce 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,7 +38,7 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 7
-VER_RELEASE      = 0
+VER_RELEASE      = 1
 VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
@@ -503,7 +503,8 @@ def build_locale_dir(destdir, verbose=1):
     moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo'))
     for src in moFiles:
         lang = os.path.splitext(os.path.basename(src))[0]
-        dest = opj(destdir, lang)
+        #dest = opj(destdir, lang)
+        dest = opj(destdir, lang, 'LC_MESSAGES')
         mkpath(dest, verbose=verbose)
         copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose)
         CLEANUP.append(opj(dest, 'wxstd.mo'))
@@ -574,7 +575,7 @@ def adjustCFLAGS(cflags, defines, includes):
 
 
 
-def adjustLFLAGS(lfags, libdirs, libs):
+def adjustLFLAGS(lflags, libdirs, libs):
     '''Extract the -L and -l flags and put them in libdirs and libs as needed'''
     newLFLAGS = []
     for flag in lflags:
@@ -585,7 +586,11 @@ def adjustLFLAGS(lfags, libdirs, libs):
         else:
             newLFLAGS.append(flag)
 
-    return newLFLAGS
+    # remove any flags for universal binaries, we'll get those from
+    # distutils instead
+    return [flag for flag in newLFLAGS
+            if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
+            not flag.startswith('/Developer') ]