From 97d2ce98c400f23fb0e60b964e2d3a952be0148d Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 24 Jan 2014 15:40:19 -0800
Subject: [PATCH] Fix DOM binding generation to use proper output directory.

---
 Makefile.in | 6 +++---
 mk/clean.mk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a1ffee46398..49ff74a73d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,14 +294,14 @@ CACHE_DIR = $(BINDINGS_SRC)/_cache
 
 bindinggen_dependencies := $(addprefix $(BINDINGS_SRC)/, BindingGen.py Bindings.conf Configuration.py CodegenRust.py parser/WebIDL.py ParserResults.pkl)
 
-$(AUTOGEN_SRC_script): %Binding.rs: $(bindinggen_dependencies) \
-                                    $(WEBIDLS_script)
+$(AUTOGEN_SRC_script): $(BINDINGS_SRC)/%Binding.rs: $(bindinggen_dependencies) \
+                                                    $(addprefix $(WEBIDLS_SRC)/, %.webidl)
 	@$(call E, "Maybe generating $(shell basename $@)...")
 	$(Q)PYTHONDONTWRITEBYTECODE=1 $(CFG_PYTHON2) $(BINDINGS_SRC)/pythonpath.py \
 	  -I$(BINDINGS_SRC)/parser -I$(BINDINGS_SRC)/ply \
 	  -D$(BINDINGS_SRC) \
 	  $(BINDINGS_SRC)/BindingGen.py rs \
-	  $(BINDINGS_SRC)/Bindings.conf $*Binding $(subst $(BINDINGS_SRC), $(WEBIDLS_SRC), $*.webidl)
+	  $(BINDINGS_SRC)/Bindings.conf $*Binding $(addprefix $(WEBIDLS_SRC)/, $*.webidl)
 	$(Q)touch $@
 
 globalgen_dependencies := $(addprefix $(BINDINGS_SRC)/, GlobalGen.py Bindings.conf Configuration.py CodegenRust.py parser/WebIDL.py) $(CACHE_DIR)/.done
diff --git a/mk/clean.mk b/mk/clean.mk
index d76b3ada1e2..721ba83d3aa 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -52,4 +52,4 @@ clean-style:
 clean-servo: clean-gfx clean-util clean-net clean-script clean-msg clean-style
 	@$(call E, "cleaning servo")
 	$(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so
-	$(Q)cd $(BINDINGS_SRC) && rm -f *.pkl
+	$(Q)cd $(BINDINGS_SRC) && rm -f *.pkl *.rs