Follow-up to bug 1212272 - use the correct cp command. r=dmose
authorMark Banner <standard8@mozilla.com>
Thu, 08 Oct 2015 21:25:19 +0100
changeset 266933 e5dd1d0bae2cad5d19571f779c1a97875e6eaee7
parent 266932 e63ba8ad3c02cd6d28e3f8f260b110f5da40929a
child 266934 4a9f3479467877818de59a00b6e43856fdfc5c14
push id29503
push usercbook@mozilla.com
push dateFri, 09 Oct 2015 09:36:47 +0000
treeherdermozilla-central@462074ffada4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmose
bugs1212272
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Follow-up to bug 1212272 - use the correct cp command. r=dmose
browser/components/loop/standalone/Makefile
--- a/browser/components/loop/standalone/Makefile
+++ b/browser/components/loop/standalone/Makefile
@@ -21,17 +21,17 @@ install: npm_install
 npm_install:
 	@npm install
 
 # build the dist dir, which contains a production version of the code and
 # assets
 .PHONY: dist
 dist:
 	mkdir -p dist
-	cp -pR content dist
+	cp -pR content/* dist
 	NODE_ENV="production" $(NODE_LOCAL_BIN)/webpack \
 		-p -v --display-errors
 	sed 's#webappEntryPoint.js#js/standalone.js#' \
 		< content/index.html > dist/index.html
 
 .PHONY: distclean
 distclean:
 	rm -fr dist