summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-03-17 15:03:59 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-03-17 15:06:58 +0200
commit992c6c361cad202467c392752de22d699a9897dc (patch)
tree996410388f872387d8a8661273193b78adbde2fa
parentaf1aaedbdb9e6778559e1c1934eb2ea9a9d03191 (diff)
Sprinkle some realpath goodness here, too
-rwxr-xr-xsfx2/AllLangResTarget_sfx2.mk8
-rwxr-xr-xsfx2/Library_sfx.mk14
2 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index c49fd42cd9..77691fe880 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 1fbee91e9f..4d2396bf06 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)))