solenv/gbuild/platform/solaris.mk | 4 ++--
solenv/gbuild/platform/unxgcc.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 17a2dcabe15f24567b5b68f92ede6cb19a62405c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 20 14:36:18 2011 +0200
Consistently rename NONEBIN -> NONE for all platforms.
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 010a6b5..bab6eef 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -192,7 +192,7 @@ gb_LinkTarget__RPATHS := \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib
\
SDKBIN:\dORIGIN/../../ure-link/lib \
- NONEBIN:\dORIGIN/../lib:\dORIGIN \
+ NONE:\dORIGIN/../lib:\dORIGIN \
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
@@ -326,7 +326,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) \
define gb_Executable_get_rpath
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f142e4a..3ed4325 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -280,7 +280,7 @@ gb_LinkTarget__RPATHS := \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib
\
SDKBIN:\dORIGIN/../../ure-link/lib \
- NONEBIN:\dORIGIN/../lib:\dORIGIN \
+ NONE:\dORIGIN/../lib:\dORIGIN \
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
@@ -419,7 +419,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) \
define gb_Executable_get_rpath
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
