[Libreoffice-commits] .: Branch 'integration/dev300_m101' - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/AllLangResTarget.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d2c34efe434c152d913becd7a8abc0173bb010dd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 12:01:15 2011 +0200

    Add realpath calls
    
    This avoids passing pathnames containing symlinks to non-Cygwin
    programs. Calling realpath here hopefully means that we don't need to
    explicitly expand the pathnames for the src files listed in the
    */AllLangResTarget_*.mk files.

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 763f2a4..4a655d3 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -69,10 +69,10 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	RESPONSEFILE=`$(gb_MKTEMP)` && \
 	echo "-s \
 		$(INCLUDE) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(DEFS) \
 		-fp=$(1) \
-		$(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \
+		$(realpath $(if $<,$<,$(MERGEDFILE)))" > $${RESPONSEFILE} && \
 	$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
 	rm -rf $${RESPONSEFILE})
 
@@ -199,7 +199,7 @@ endef
 
 gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
 gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
-gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
+gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/default_images)/
 
 $(call gb_ResTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),RES,2)