Sprinkle some realpath goodness here, too

(cherry picked from commit f60ac8bb5f2a22fa2826cf08589976cb4a259d74)

6 files changed, 53 insertions, 53 deletions

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 2ea8bfc0b332..1e21ccaae48c 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -37,32 +37,32 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/inc/sw \
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/core/undo \
-    -I$(SRCDIR)/sw/source/core/unocore \
-    -I$(SRCDIR)/sw/source/ui/chrdlg \
-    -I$(SRCDIR)/sw/source/ui/config \
-    -I$(SRCDIR)/sw/source/ui/dbui \
-    -I$(SRCDIR)/sw/source/ui/dialog \
-    -I$(SRCDIR)/sw/source/ui/docvw \
-    -I$(SRCDIR)/sw/source/ui/envelp \
-    -I$(SRCDIR)/sw/source/ui/fldui \
-    -I$(SRCDIR)/sw/source/ui/fmtui \
-    -I$(SRCDIR)/sw/source/ui/frmdlg \
-    -I$(SRCDIR)/sw/source/ui/globdoc \
-    -I$(SRCDIR)/sw/source/ui/inc \
-    -I$(SRCDIR)/sw/source/ui/index \
-    -I$(SRCDIR)/sw/source/ui/lingu \
-    -I$(SRCDIR)/sw/source/ui/misc \
-    -I$(SRCDIR)/sw/source/ui/ribbar \
-    -I$(SRCDIR)/sw/source/ui/shells \
-    -I$(SRCDIR)/sw/source/ui/smartmenu \
-    -I$(SRCDIR)/sw/source/ui/table \
-    -I$(SRCDIR)/sw/source/ui/uiview \
-    -I$(SRCDIR)/sw/source/ui/utlui \
-    -I$(SRCDIR)/sw/source/ui/web \
-    -I$(SRCDIR)/sw/source/ui/wrtsh \
+    -I$(realpath $(SRCDIR)/sw/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/core/undo) \
+    -I$(realpath $(SRCDIR)/sw/source/core/unocore) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/chrdlg) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/config) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/dbui) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/dialog) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/docvw) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/envelp) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/fldui) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/fmtui) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/frmdlg) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/globdoc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/index) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/lingu) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/misc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/ribbar) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/shells) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/smartmenu) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/table) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/uiview) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/utlui) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/web) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/wrtsh) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,sw/res,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index a05b6932beb6..35ceb2d1f756 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Library_Library,msword))
 $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
 
 $(eval $(call gb_Library_set_include,msword,\
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
-    -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/inc/pch \
-    -I$(SRCDIR)/sw/inc \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+    -I$(realpath $(SRCDIR)/sw/inc/pch) \
+    -I$(realpath $(SRCDIR)/sw/inc) \
     -I$(WORKDIR)/inc/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 8d929e55b96b..1ccedbd1ee32 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -34,11 +34,11 @@ $(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
 $(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
 
 $(eval $(call gb_Library_set_include,sw,\
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
-    -I$(SRCDIR)/sw/inc/pch \
-    -I$(SRCDIR)/sw/inc \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sw/inc/pch) \
+    -I$(realpath $(SRCDIR)/sw/inc) \
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
@@ -732,8 +732,8 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
 
 $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/sdi \
+    -I$(realpath $(SRCDIR)/sw/inc) \
+    -I$(realpath $(SRCDIR)/sw/sdi) \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 3a76b87ea209..97edee8da0eb 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -33,11 +33,11 @@ $(eval $(call gb_Library_set_include,swd,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/sw/sdi \
     -I$(WORKDIR)/inc/sw \
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/inc/pch \
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(realpath $(SRCDIR)/sw/inc) \
+    -I$(realpath $(SRCDIR)/sw/inc/pch) \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
     -I$(OUTDIR)/inc/offuh \
 ))
 
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 10233944ba9c..aee68142ead0 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -28,11 +28,11 @@
 $(eval $(call gb_Library_Library,swui))
 
 $(eval $(call gb_Library_set_include,swui,\
-    -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/inc/pch \
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(realpath $(SRCDIR)/sw/inc) \
+    -I$(realpath $(SRCDIR)/sw/inc/pch) \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw \
     $$(INCLUDE) \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index eccaa8ef0497..361a863c7322 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Library_Library,vbaswobj))
 $(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
 
 $(eval $(call gb_Library_set_include,vbaswobj,\
-    -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
-    -I$(SRCDIR)/sw/inc/pch \
-    -I$(SRCDIR)/sw/inc \
+    -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+    -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sw/inc/pch) \
+    -I$(realpath $(SRCDIR)/sw/inc) \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \