diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-17 12:01:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-17 12:09:00 +0200 |
| commit | d2c34efe434c152d913becd7a8abc0173bb010dd (patch) | |
| tree | 2bb015f3b03c1f0d135d54a1b65bc3f1c9351001 | |
| parent | fe4b69e65a1aec5b45390eae65f998a047edbbae (diff) | |
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.
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 763f2a435..4a655d320 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) |