[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/macosx.mk |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a3cd73f3153b4a6c337144bd0f85769f059b3019
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 20 07:22:26 2011 +0200

    Reverted previous ff1c626, instead renamed NONEBIN -> NONE.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index cabf855..aa560a3 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -273,7 +273,7 @@ gb_LinkTarget__RPATHS := \
 	OOO:@__________________________________________________OOO/ \
 	BRAND: \
 	SDKBIN: \
-	NONEBIN: \
+	NONE: \
 
 define gb_LinkTarget__get_installname
 $(if $(2),-install_name '$(2)$(1)',)
@@ -338,9 +338,8 @@ $(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)) &&) \
@@ -452,7 +451,7 @@ gb_Executable_LAYER := \
 	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
 	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
 	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+	$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
 
 
 gb_Executable_get_rpath :=