[Libreoffice-commits] .: 2 commits - .gitignore translate_toolkit/makefile.mk

[Norbert Thiebaud]

 .gitignore                    |    4 ++++
 translate_toolkit/makefile.mk |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 353ddae6eb01808889156ae54b48d27a5468153a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 27 12:49:27 2011 -0500

    fix DEPLOYMENT_TARGET snafu on Mac for translate_toolkit

diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk
index 2e13581..7c6df62 100644
--- a/translate_toolkit/makefile.mk
+++ b/translate_toolkit/makefile.mk
@@ -58,7 +58,11 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
 .IF "$(SYSTEM_PYTHON)"!="YES"
 PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
 .ELSE                   # "$(SYSTEM_PYTHON)"!="YES"
+.IF "$(OS)"=="MACOSX"
+PY_CMD=$(AUGMENT_LIBRARY_PATH) && unset MACOSX_DEPLOYMENT_TARGET && $(WRAPCMD) $(PYTHON)
+.ELSE
 PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON)
+.ENDIF
 .ENDIF                  # "$(SYSTEM_PYTHON)"!="YES"
 
 # --- Files --------------------------------------------------------
commit 442185daa1efb5ead9dc42caffdaeee4c97902bc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 27 12:48:48 2011 -0500

    adjust gitignore rule for Mac and to ignore .gitattributes (now a link)

diff --git a/.gitignore b/.gitignore
index 6a3b988..9e0eab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,15 @@
 *~
 .*.sw[op]
 
+.gitattributes
+
 # the build directories
 /*/unxlng??
 /*/unxlng??.pro
 /*/wntmsc???
 /*/wntmsc???.pro
+/*/unxmac??
+/*/unxmac??.pro
 
 /external/*/*.dll
 /external/*/*.txt