Bug 869883 - Use system/Makefile to copy the camera app

.gitignore

@@ -6,7 +6,6 @@
 *~
 manifest.appcache
 
-/apps/system/camera
 /apps/settings/resources/gaia_commit.txt
 /apps/homescreen/js/init.json
 /apps/homescreen/js/hiddenapps.js

Makefile

@@ -286,9 +286,6 @@ webapp-manifests: install-xulrunner-sdk
 # Generate profile/webapps/APP/application.zip
 webapp-zip: stamp-commit-hash install-xulrunner-sdk
 ifneq ($(DEBUG),1)
-	@rm -rf apps/system/camera
-	@cp -r apps/camera apps/system/camera
-	@rm apps/system/camera/manifest.webapp
 	@mkdir -p profile/webapps
 	@$(call run-js-command, webapp-zip)
 endif

apps/system/.gitignore

@@ -0,0 +1 @@
+/camera

apps/system/Makefile

@@ -0,0 +1,9 @@
+all: copy-camera-app
+
+# This make target copies the camera app to System app
+# and use it as the secure camera.
+.PHONY: copy-camera-app
+copy-camera-app:
+	@rm -rf ./camera
+	@cp -r ../camera ./camera
+	@rm ./camera/manifest.webapp