* Fixes cut&paste error in configure

* Ensure that framework install works given the
  recent CFLAGS and BASECFLAGS changes

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 5fb5cd46cc0d5d6a8c08b5368462f9495d8828fd..bea5f995e910457cd929d0c3d7234fbef976ca2b 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -17,6 +17,9 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
 PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
 LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
 CC=@CC@
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_DEPLOYMENT_TARGET
+
 
 
 # These are normally glimpsed from the previous set

diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in
index 96493ad678711d3e8d5f6ae0edd6f6b4a05917f0..539ed1a8d0c6153eb9043cb41895287579307e04 100644 (file)
--- a/Mac/PythonLauncher/Makefile.in
+++ b/Mac/PythonLauncher/Makefile.in
@@ -2,7 +2,7 @@ CC=@CC@
 LD=@CC@
 BASECFLAGS=@BASECFLAGS@
 OPT=@OPT@
-CFLAGS=$(BASECFLAGS) $(OPT)
+CFLAGS=@CFLAGS@ $(BASECFLAGS) $(OPT)
 LDFLAGS=@LDFLAGS@
 srcdir=         @srcdir@
 VERSION=       @VERSION@

diff --git a/configure b/configure
index 9045b51cabf3440e4fe78394d59421362b419026..37e05763141e0c97ae6e6a530e16b06b4b81bfcc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 79975 .
+# From configure.in Revision: 80191 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -4750,7 +4750,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
                then
                        CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
                        LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-                       CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+                       CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
                fi
            fi
 

diff --git a/configure.in b/configure.in
index 2751b0ed301f305f8ff7df55d9b290240ddb09c1..7f8945e79a1749ad9426e8df580e267c25348b36 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -961,7 +961,7 @@ yes)
                then
                        CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
                        LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
-                       CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+                       CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
                fi
            fi