[Libreoffice-commits] .: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/macosx.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ff1c626fa1380c7af5a135f80b45de7e62025eed
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Sep 20 00:01:41 2011 -0500

    do not call macosx-change-install-name for NONEBIN executable

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e30201b..cabf855 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -338,8 +338,9 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(1) \
 		`cat $${DYLIB_FILE}` && \
     $(if $(filter Executable,$(TARGETTYPE)), \
+        $(if $(filter-out NONEBIN,$(LAYER)), \
         $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
-            $(LAYER) $(1) &&) \
+            $(LAYER) $(1) &&)) \
 	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
 		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \