Bustage fix for bug 506576 -- update copy in js/ as well
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Mon, 03 Aug 2009 23:06:56 +0530
changeset 31081 28f03254f3fba3d344afdf9553afc87f0129fb75
parent 31080 25462849adcc87648a7fa7fc362b34dd3931a82b
child 31082 7fb86c108ae7981111030e5520593c10859d3562
push id8357
push usersid.bugzilla@gmail.com
push dateMon, 03 Aug 2009 17:43:54 +0000
treeherdermozilla-central@28f03254f3fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506576
milestone1.9.2a1pre
Bustage fix for bug 506576 -- update copy in js/ as well
js/src/config/rules.mk
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1482,17 +1482,17 @@ normalizepath = $(foreach p,$(1),$(shell
 else
 # assume MSYS
 #  We use 'pwd -W' to get DOS form of the path.  However, since the given path
 #  could be a file or a non-existent path, we cannot call 'pwd -W' directly
 #  on the path.  Instead, we extract the root path (i.e. "c:/"), call 'pwd -W'
 #  on it, then merge with the rest of the path.
 root-path = $(shell echo $(1) | sed -e "s|\(/[^/]*\)/\?\(.*\)|\1|")
 non-root-path = $(shell echo $(1) | sed -e "s|\(/[^/]*\)/\?\(.*\)|\2|")
-normalizepath = $(foreach p,$(1),$(if $(filter /%,$(1)),$(shell cd $(call root-path,$(1)) && pwd -W)$(call non-root-path,$(1)),$(1)))
+normalizepath = $(foreach p,$(1),$(if $(filter /%,$(1)),$(patsubst %/,%,$(shell cd $(call root-path,$(1)) && pwd -W))/$(call non-root-path,$(1)),$(1)))
 endif
 else
 normalizepath = $(1)
 endif
 
 _srcdir = $(call normalizepath,$(srcdir))
 ifdef JAVA_SOURCEPATH
 SP = $(subst $(SPACE),$(SEP),$(call normalizepath,$(strip $(JAVA_SOURCEPATH))))