Bug 1273006 - Don't include makefiles from toolkit/mozapps/installer …

…needlessly; r=glandium

These includes make out-of-tree builds of SpiderMonkey depend on the
installer.

Makefile.in

@@ -286,10 +286,12 @@ MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist
 
 SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
+ifdef MOZ_CRASHREPORTER
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 SYMBOL_INDEX_NAME = \
   $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
+endif
 
 buildsymbols:
 ifdef MOZ_CRASHREPORTER

build/moz-automation.mk

@@ -11,12 +11,6 @@ else
 endif
 endif
 
-include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
-include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk
-
-# Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
-DIST_FILES =
-
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
 tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols