From b42c9e0d396ea210291feae0bd75926ff0ebc9fc Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 25 Jul 2011 18:00:40 -0500 Subject: [PATCH] Use MACOSX_SDK_PATH --- moz/makefile.mk | 5 ++--- python/makefile.mk | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/moz/makefile.mk b/moz/makefile.mk index 94d6935..0ee92d3 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -152,11 +152,10 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \ .IF "$(GUI)"=="UNX" .IF "$(GUIBASE)"=="aqua" -MACDEVSDK*=/Developer/SDKs/MacOSX10.4u.sdk MOZILLA_CONFIGURE_FLAGS+= \ - --with-macos-sdk=$(MACDEVSDK) \ + --with-macos-sdk=$(MACOSX_DEV_SDK) \ --disable-glibtest \ - --enable-macos-target=10.4 \ + --enable-macos-target=$(MACOSX_DEPLOYMENT_TARGET) \ --disable-libxul DEFAULT_MOZILLA_TOOLKIT=mac .ELSE diff --git a/python/makefile.mk b/python/makefile.mk index d91660a..5468fe5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -92,8 +92,7 @@ PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch # don't build dual-arch version as OOo itself is not universal binary either PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch -MACDEVSDK*=/Developer/SDKs/MacOSX10.4u.sdk -CONFIGURE_ACTION+=--enable-universalsdk=$(MACDEVSDK) --with-universal-archs=32-bit --enable-framework=/python-inst --with-framework-name=OOoPython +CONFIGURE_ACTION+=--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/python-inst --with-framework-name=OOoPython ALLTAR: $(MISC)/OOoPython.framework.zip .ENDIF -- 1.7.3.2