Backport of 1.54:

Do an actual test for xcodebuild, in stead of relying on the user to
uncomment the relevant section.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 469cd8ee0c2b042fb2a7d3397bb054f701476a19..a1eeed1f6339f45ebc6c9fcc91ca62e1bb829f5d 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -10,10 +10,12 @@ LIBDEST=$(prefix)/lib/python$(VERSION)
 BUILDPYTHON=$(builddir)/python.exe
 DESTDIR=
 
-# For 10.2:
-#PBXBUILD=pbxbuild
-# For 10.3:
+# Test whether to use xcodebuild (preferred) or pbxbuild:
+ifeq ($(shell ls /usr/bin/xcodebuild),/usr/bin/xcodebuild)
 PBXBUILD=xcodebuild
+else
+PBXBUILD=pbxbuild
+endif
 
 # These are normally glimpsed from the previous set
 bindir=/usr/local/bin