From 02bc2657b6ce97415a3a058723873cfc8cd82de3 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 20 Feb 2015 13:26:59 -0500
Subject: [PATCH] Bug 1135654 - part 1 - move backtrace conversion scripts to
 FINAL_TARGET_FILES; r=mshal

---
 build/Makefile.in | 21 ---------------------
 build/moz.build   | 11 +++++++++++
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/build/Makefile.in b/build/Makefile.in
index 2a178476742..7f79fb9f80d 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -113,27 +113,6 @@ libs:: $(_VALGRIND_FILES)
 	$(INSTALL) $^ $(_VALGRIND_DIR)
 endif
 
-ifneq (,$(ENABLE_TESTS)$(MOZ_DMD))
-libs:: $(topsrcdir)/tools/rb/fix_stack_using_bpsyms.py
-	$(INSTALL) $< $(DIST)/bin
-
-ifeq ($(OS_ARCH),Darwin)
-libs:: $(topsrcdir)/tools/rb/fix_macosx_stack.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-
-ifeq ($(OS_ARCH),Linux)
-libs:: $(topsrcdir)/tools/rb/fix_linux_stack.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-endif # ENABLE_TESTS or MOZ_DMD
-
 ifdef ENABLE_TESTS
 GARBAGE += $(srcdir)/automationutils.pyc
 endif # ENABLE_TESTS
-
-ifdef MOZ_DMD
-libs:: $(topsrcdir)/memory/replace/dmd/dmd.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-
diff --git a/build/moz.build b/build/moz.build
index 74728007c54..1944ff30d88 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -48,3 +48,14 @@ if CONFIG['MOZ_BUILD_APP'] == 'browser':
     PYTHON_UNIT_TESTS += [
         'compare-mozconfig/compare-mozconfigs-wrapper.py',
     ]
+
+if CONFIG['ENABLE_TESTS'] or CONFIG['MOZ_DMD']:
+    tools_dir = TOPSRCDIR + '/tools/rb/'
+    FINAL_TARGET_FILES += [tools_dir + 'fix_stack_using_bpsyms.py']
+    if CONFIG['OS_ARCH'] == 'Darwin':
+        FINAL_TARGET_FILES += [tools_dir + 'fix_macosx_stack.py']
+    if CONFIG['OS_ARCH'] == 'Linux':
+        FINAL_TARGET_FILES += [tools_dir + 'fix_linux_stack.py']
+
+if CONFIG['MOZ_DMD']:
+    FINAL_TARGET_FILES += [TOPSRCDIR + '/memory/replace/dmd/dmd.py']