mozilla-central: changeset 96733:9191e3007100b59e55b87a94045bd0ca5c202854

author	Myk Melez <myk@mozilla.org>
	Thu, 14 Jun 2012 13:21:06 -0700
changeset 96733	9191e3007100b59e55b87a94045bd0ca5c202854
parent 96732	c25ccddcf42142d4d276c8cca925d0ac4b521277
child 96734	55f8b9b957c313eebf12ea03000cb4d76e41160f
push id	22934
push user	emorley@mozilla.com
push date	Fri, 15 Jun 2012 12:37:14 +0000
treeherder	mozilla-central@892f95753777 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmedberg
bugs	763778
milestone	16.0a1
first release with	nightly linux32 4e3362864fbd / 16.0a1 / 20120616030538 / files nightly linux64 4e3362864fbd / 16.0a1 / 20120616030538 / files nightly mac 4e3362864fbd / 16.0a1 / 20120616030538 / files nightly win32 4e3362864fbd / 16.0a1 / 20120616030538 / files nightly win64 4e3362864fbd / 16.0a1 / 20120616030538 / files
last release without	nightly linux32 983b91e5aa17 / 16.0a1 / 20120614075912 / files nightly linux64 983b91e5aa17 / 16.0a1 / 20120614075912 / files nightly mac 983b91e5aa17 / 16.0a1 / 20120614075912 / files nightly win32 983b91e5aa17 / 16.0a1 / 20120614075912 / files nightly win64 983b91e5aa17 / 16.0a1 / 20120614075912 / files

--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -37,29 +37,28 @@ EXTRA_PP_COMPONENTS = \
   ContentPolicy.js \
   DirectoryProvider.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
   WebappRT.jsm \
   $(NULL)
 
+PREF_JS_EXPORTS = $(srcdir)/prefs.js \
+                  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
 libs::
 	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "resource webapprt ./"
 
-libs:: prefs.js
-	$(NSINSTALL) -D $(FINAL_TARGET)/defaults/preferences
-	$(INSTALL) $^ $(FINAL_TARGET)/defaults/preferences
-
 GRE_MILESTONE := $(shell tail -n 1 $(topsrcdir)/config/milestone.txt 2>/dev/null || tail -1 $(topsrcdir)/config/milestone.txt)
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
            -DGRE_BUILDID=$(GRE_BUILDID) \
            -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME) \
            $(NULL)
 
 webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt