10 files changed, 13 insertions, 8 deletions
diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index 7faf1a068701..ba380babb279 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/makefile.mk
@@ -81,7 +81,7 @@ DEPOBJFILES= \
 .INCLUDE :  target.mk
 
 $(MISC)$/dict_%.cxx : %.dic
-    $(BIN)$/gendict $< $@
+    $(AUGMENT_LIBRARY_PATH) $(BIN)$/gendict $< $@
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index 2db7d3c7d73b..7ba9cd3e753d 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -64,6 +64,7 @@ SLOFILES=   \
 OBJFILES   = $(OBJ)$/gendict.obj
 
 APP1TARGET = gendict
+APP1RPATH = NONE
 
 DEPOBJFILES   = $(OBJ)$/gendict.obj 
 APP1OBJS   = $(DEPOBJFILES)
@@ -77,9 +78,9 @@ GENCMN:=$(SYSTEM_GENCMN)
 GENBRK:=$(SYSTEM_GENBRK)
 GENCCODE:=$(SYSTEM_GENCCODE)
 .ELSE
-GENCMN:=$(SOLARBINDIR)$/gencmn
-GENBRK:=$(SOLARBINDIR)$/genbrk
-GENCCODE:=$(SOLARBINDIR)$/genccode
+GENCMN:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/gencmn
+GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk
+GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
 .ENDIF
 
 $(MISC)$/%.brk : data/%.txt
diff --git a/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk
index 18e610c7a996..bdf802adc94d 100644
--- a/i18npool/source/collator/data/makefile.mk
+++ b/i18npool/source/collator/data/makefile.mk
@@ -61,7 +61,7 @@ SHL1OBJS=$(SLOFILES)
 .INCLUDE :  target.mk
 
 $(MISC)$/collator_%.cxx : %.txt
-    $(BIN)$/gencoll_rule $< $@ $*
+    $(AUGMENT_LIBRARY_PATH) $(BIN)$/gencoll_rule $< $@ $*
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
diff --git a/i18npool/source/collator/makefile.mk b/i18npool/source/collator/makefile.mk
index b1e2791f873b..bca1c00aa419 100644
--- a/i18npool/source/collator/makefile.mk
+++ b/i18npool/source/collator/makefile.mk
@@ -54,6 +54,7 @@ SLOFILES=   \
         $(rules_obj)
 
 APP1TARGET = gencoll_rule
+APP1RPATH = NONE
 
 APP1OBJS   = $(OBJ)$/gencoll_rule.obj
 
diff --git a/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk
index e58b0b7c2c90..6149bbd8b12a 100644
--- a/i18npool/source/indexentry/data/makefile.mk
+++ b/i18npool/source/indexentry/data/makefile.mk
@@ -64,7 +64,7 @@ LIB1OBJFILES=$(SHL1OBJS)
 .INCLUDE :  target.mk
 
 $(MISC)$/%.cxx : %.txt
-    $(BIN)$/genindex_data $< $@ $*
+    $(AUGMENT_LIBRARY_PATH) $(BIN)$/genindex_data $< $@ $*
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
diff --git a/i18npool/source/indexentry/makefile.mk b/i18npool/source/indexentry/makefile.mk
index e10f05e920ed..770fe062c688 100644
--- a/i18npool/source/indexentry/makefile.mk
+++ b/i18npool/source/indexentry/makefile.mk
@@ -54,6 +54,7 @@ SLOFILES=   \
 OBJFILES   = $(OBJ)$/genindex_data.obj
 
 APP1TARGET = genindex_data
+APP1RPATH = NONE
 
 DEPOBJFILES   = $(OBJ)$/genindex_data.obj
 APP1OBJS   = $(DEPOBJFILES)
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index b288275a386e..3eca889e7ccc 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -495,6 +495,6 @@ DEPOBJFILES= \
 $(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST)
 
 $(MISC)$/localedata_%.cxx : %.xml
-    $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
+    $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/saxparser $* $< $@ $(BIN)$/$(@:b).rdb $(SOLARBINDIR)$/types.rdb
     $(RM) $(BIN)$/$(@:b).rdb
 
diff --git a/i18npool/source/localedata/makefile.mk b/i18npool/source/localedata/makefile.mk
index 847d1df7240b..e1bd0ac1a6ce 100644
--- a/i18npool/source/localedata/makefile.mk
+++ b/i18npool/source/localedata/makefile.mk
@@ -68,6 +68,7 @@ OBJFILES   = \
         $(OBJ)$/filewriter.obj
 
 APP1TARGET = saxparser
+APP1RPATH = NONE
 
 APP1OBJS   = $(OBJFILES)
 
diff --git a/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index f1e2652c23cc..37569e1f3fd7 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/makefile.mk
@@ -65,7 +65,7 @@ LIB1OBJFILES=$(SHL1OBJS)
 
 APP1TARGET = genconv_dict
 $(MISC)$/%.cxx : %.dic
-    $(BIN)$/genconv_dict $* $< $@
+    $(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
diff --git a/i18npool/source/textconversion/makefile.mk b/i18npool/source/textconversion/makefile.mk
index e271205ed010..431abb1b513f 100644
--- a/i18npool/source/textconversion/makefile.mk
+++ b/i18npool/source/textconversion/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES=   \
 OBJFILES   = $(OBJ)$/genconv_dict.obj
 
 APP1TARGET = genconv_dict
+APP1RPATH = NONE
 
 APP1OBJS   = $(OBJ)$/genconv_dict.obj