[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svx/AllLangResTarget_gal.mk svx/AllLangResTarget_svx.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk

[Tor Lillqvist]

 svx/AllLangResTarget_gal.mk       |    4 ++--
 svx/AllLangResTarget_svx.mk       |    6 +++---
 svx/Library_svx.mk                |    6 +++---
 svx/Library_textconversiondlgs.mk |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit c378eb15297ba53867689687cbc75350abd147e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 18 11:55:31 2011 +0200

    Sprinkle some realpath goodness here, too

diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index eb0b5b1..3b00b8e 100755
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -36,8 +36,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
 $(eval $(call gb_SrsTarget_set_include,svx/gal,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(SRCDIR)/svx/source/gallery \
-    -I$(SRCDIR)/svx/inc/ \
+    -I$(realpath $(SRCDIR)/svx/source/gallery) \
+    -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/gal,\
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index a18852a..3ae2664 100755
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -40,9 +40,9 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/inc \
     -I$(WORKDIR)/inc/svx \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/source/dialog \
-    -I$(SRCDIR)/svx/inc/ \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
+    -I$(realpath $(SRCDIR)/svx/source/dialog) \
+    -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/res,\
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a2346cf..99d51dd 100755
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,svx))
 $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 
 $(eval $(call gb_Library_set_include,svx,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/inc/pch \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(SOLARINC) \
     -I$(OUTDIR)/inc/offuh \
 ))
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 03a457b..513789f 100755
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -30,8 +30,8 @@ $(eval $(call gb_Library_Library,textconversiondlgs))
 $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
 
 $(eval $(call gb_Library_set_include,textconversiondlgs,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/inc/pch \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
 ))