[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sfx2/AllLangResTarget_sfx2.mk sfx2/Library_sfx.mk

[Tor Lillqvist]

 sfx2/AllLangResTarget_sfx2.mk |    8 ++++----
 sfx2/Library_sfx.mk           |   14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 992c6c361cad202467c392752de22d699a9897dc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 15:03:59 2011 +0200

    Sprinkle some realpath goodness here, too

diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index c49fd42..77691fe 100755
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_SrsTarget_set_include,sfx/res,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/inc \
-    -I$(SRCDIR)/sfx2/source/dialog \
-    -I$(SRCDIR)/sfx2/source/inc \
-    -I$(SRCDIR)/sfx2/inc/ \
-    -I$(SRCDIR)/sfx2/inc/sfx \
+    -I$(realpath $(SRCDIR)/sfx2/source/dialog) \
+    -I$(realpath $(SRCDIR)/sfx2/source/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/sfx) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,sfx/res,\
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 1fbee91..4d2396b 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -39,10 +39,10 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\
-    -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
-    -I$(SRCDIR)/sfx2/source/inc \
-    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(realpath $(SRCDIR)/sfx2/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+    -I$(realpath $(SRCDIR)/sfx2/source/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/inc/pch) \
     -I$(WORKDIR)/SdiTarget/sfx2/sdi \
     -I$(WORKDIR)/inc/ \
     $$(INCLUDE) \
@@ -239,9 +239,9 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
 
 $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
-    -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/sdi \
+    -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
+    -I$(realpath $(SRCDIR)/sfx2/inc) \
+    -I$(realpath $(SRCDIR)/sfx2/sdi) \
 ))
 
 ifeq ($(OS),$(filter WNT MACOSX,$(OS)))