[Libreoffice-commits] .: moz/makefile.mk python/makefile.mk

[Norbert Thiebaud]

 moz/makefile.mk    |    5 ++---
 python/makefile.mk |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit dd1762ac00bcc97a5be0b2aa5b2e2b20cf981960
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jul 25 18:00:40 2011 -0500

    Use MACOSX_SDK_PATH

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 0419e61..ad9783f 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -93,8 +93,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