[Libreoffice] Build break when generating RDBs

[ build ALL ] top level modules: i18npool
[ build ALL ] loaded modules: i18npool
[ build RDB ] i18npool_test_breakiterator
awk: cmd. line:1: $R/^<\?xml version.*$R/ { next; } { 
gsub($R/vnd.sun.star.expand:\$OOO_BASE_DIR\$R/program$R/, "vnd.sun.star.expand:$OOO_BASE_DIR",$0); 
gsub($R/vnd.sun.star.expand:\$BRAND_BASE_DIR\$R/program$R/, 
"vnd.sun.star.expand:$BRAND_BASE_DIR",$0); print; }
awk: cmd. line:1:    ^ syntax error
awk: cmd. line:1: $R/^<\?xml version.*$R/ { next; } { 
gsub($R/vnd.sun.star.expand:\$OOO_BASE_DIR\$R/program$R/, "vnd.sun.star.expand:$OOO_BASE_DIR",$0); 
gsub($R/vnd.sun.star.expand:\$BRAND_BASE_DIR\$R/program$R/, 
"vnd.sun.star.expand:$BRAND_BASE_DIR",$0); print; }
awk: cmd. line:1:      ^ backslash not last character on line
make: *** [/libreoffice/workdir/unxlngx6.pro/RdbTarget/i18npool_test_breakiterator.rdb] Error 1

I'm getting the above build error which seems to be caused by $R being 
added to the awk regex expression by gb_Helper_abbreviate_dirs.
The below patch makes the above error go away but it is replaced by 
another one.

[ build ALL ] top level modules: i18npool
[ build ALL ] loaded modules: i18npool
[ build CUT ] i18npool_test_breakiterator
/bin/sh: line 1: 26578 Aborted                 LD_LIBRARY_PATH=$O$R/lib 
STAR_RESOURCEPATH=$O$R/bin$R/ $O$R/bin$R/cppunit$R/cppunittester 
$W$R/LinkTarget$R/CppunitTest$R/libtest_i18npool_test_breakiterator.so --headless --invisible 
"-env:UNO_TYPES= file:$R/$R/$O$R/bin$R/udkapi.rdb  file:$R/$R/$O$R/bin$R/types.rdb" 
"-env:UNO_SERVICES=file:$R/$R/$O$R/xml$R/ure$R/services.rdb  
file:$R/$R/$W$R/RdbTarget$R/i18npool_test_breakiterator.rdb" 
-env:URE_INTERNAL_LIB_DIR=file:$R/$R/$O$R/lib -env:OOO_BASE_DIR=file:$R/$R/$O$R/lib 
-env:BRAND_BASE_DIR=file:$R/$R/$O$R/lib > $W$R/CppunitTest$R/i18npool_test_breakiterator.test.log 
2>&1
terminate called after throwing an instance of 
'com::sun::star::loader::CannotActivateFactoryException'
make: *** [/libreoffice/workdir/unxlngx6.pro/CppunitTest/i18npool_test_breakiterator.test] Error 1

diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 904ebcf..13b7a81 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -30,7 +30,7 @@ gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
 
 $(call gb_RdbTarget_get_target,%) :
        $(call gb_Output_announce,$*,$(true),RDB,1)
-       $(call gb_Helper_abbreviate_dirs,\
+       $(subst $$R,,$(call gb_Helper_abbreviate_dirs,\
                mkdir -p $(dir $@) && \
                echo '<?xml version="1.0"?><components 
xmlns="http://openoffice.org/2010/uno-components";>' > $@ && \
                $(gb_AWK) -- \
@@ -39,7 +39,7 @@ $(call gb_RdbTarget_get_target,%) :
                        $(foreach component,$(COMPONENTS),$(call 
gb_ComponentTarget_get_target,$(component))) \
                        $(foreach component,$(OLD_COMPONENTS),$(call 
gb_RdbTarget__get_old_component_target,$(component))) \
                        >> $@ && \
-               echo '</components>' >> $@)
+               echo '</components>' >> $@))
 
 .PHONY : $(call gb_RdbTarget_get_clean_target,%)
 $(call gb_RdbTarget_get_clean_target,%) :