gnumake3: using \d escape sequence in rapths to avoid expansion annoyance

4 files changed, 21 insertions, 20 deletions

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 5c380ea8df2b..cf635c1f7145 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -187,12 +187,12 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
 endef
 
 gb_LinkTarget__RPATHS := \
-    URELIB:$$$$ORIGIN \
-    UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
-    OOO:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \
-    BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \
-    SDKBIN:$$$$ORIGIN/../../ure-link/lib \
-    NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+    URELIB:\dORIGIN \
+    UREBIN:\dORIGIN/../lib:\dORIGIN \
+    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 \
 
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
@@ -211,7 +211,7 @@ $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     $(gb_CXX) \
         $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-        $(RPATH) $(LDFLAGS) \
+        $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
         $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
         $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
         $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
@@ -377,7 +377,8 @@ endef
 
 gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
-    OOOLIB:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/
+    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 9cd15b15e22c..96c1caf17b72 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -421,7 +421,7 @@ endef
 gb_ComponentTarget_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
     OOOLIB:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/
+    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 402725e1a795..f4056c22d1f7 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -169,12 +169,12 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
 endef
 
 gb_LinkTarget__RPATHS := \
-    URELIB:$$$$ORIGIN \
-    UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
-    OOO:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \
-    BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \
-    SDKBIN:$$$$ORIGIN/../../ure-link/lib \
-    NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+    URELIB:\dORIGIN \
+    UREBIN:\dORIGIN/../lib:\dORIGIN \
+    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 \
 
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
@@ -363,8 +363,8 @@ endef
 
 gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
-    OOOLIB:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/
+    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 3237a34c8cfe..ecb75aca3778 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -527,7 +527,7 @@ endif
 
 gb_ComponentTarget_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
 gb_Library_COMPONENTPREFIXES := \
-    OOOLIB:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/
+    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
+    URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 # vim: set noet sw=4 ts=4: