diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in index ac3998cd7290..7c9d774ce80e 100644 --- a/webapprt/Makefile.in +++ b/webapprt/Makefile.in @@ -2,14 +2,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -# Include config.mk explicitly so we can override FINAL_TARGET. -include $(topsrcdir)/config/config.mk - +# Include rules.mk explicitly so we can use FINAL_TARGET. Also, the dependencies +# for webapprt.ini need to be set after PP_TARGETS are expanded in rules.mk. include $(topsrcdir)/config/rules.mk -libs:: $(call mkdir_deps,$(FINAL_TARGET)) - $(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'resource webapprt ./') - MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid) DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID) diff --git a/webapprt/jar.mn b/webapprt/jar.mn index fdf7fef06801..4bd129783c7f 100644 --- a/webapprt/jar.mn +++ b/webapprt/jar.mn @@ -15,3 +15,7 @@ webapprt.jar: content/downloads/downloads.js (content/downloads/downloads.js) content/downloads/downloads.css (content/downloads/downloads.css) content/downloads/download.xml (content/downloads/download.xml) + +# Trick to put the resource line in dist/bin/webapprt/chrome.manifest +[.] chrome.jar: +% resource webapprt ./