Changeset 391 for python/trunk/Mac/IDLE/Makefile.in

Timestamp:

Mar 19, 2014, 11:31:01 PM (12 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Mac/IDLE/Makefile.in (modified) (3 diffs)

python/trunk/Mac/IDLE/Makefile.in

@@ -11 +11 @@
 builddir=       ../..
 PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
+LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
+
 
 RUNSHARED=      @RUNSHARED@
@@ -23 +25 @@
 BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
 
-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
+PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION)
 
 all: IDLE.app
@@ -52 +54 @@
                 --resource=$(srcdir)/../Icons/PythonSource.icns \
                 --resource=$(srcdir)/../Icons/PythonCompiled.icns \
-                --python=$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)`test -f "$(DESTDIR)$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)-32" && echo "-32"`  \
+                --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
                 build
-
+ifneq ($(LIPO_32BIT_FLAGS),)
+        rm "IDLE.app/Contents/MacOS/Python"
+        lipo $(LIPO_32BIT_FLAGS) -output "IDLE.app/Contents/MacOS/Python" "$(BUILDPYTHON)"
+endif
 
 Info.plist: $(srcdir)/Info.plist.in