diff --git a/.gitignore b/.gitignore index 53f5da73..0cab451c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ node_modules bower_components # Compiled Electron releases -release/ +etcher-release/ diff --git a/Makefile b/Makefile index 05a74fe7..d3683561 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ELECTRON_IGNORE=$(shell cat package.ignore | tr "\\n" "|" | sed "s/.$$//") ELECTRON_VERSION=0.36.0 APPLICATION_NAME="Etcher" -release/Etcher-darwin-x64: . +etcher-release/Etcher-darwin-x64: . $(ELECTRON_PACKAGER) . $(APPLICATION_NAME) \ --platform=darwin \ --arch=x64 \ @@ -15,7 +15,7 @@ release/Etcher-darwin-x64: . --overwrite \ --out=$(dir $@) -release/Etcher-linux-ia32: . +etcher-release/Etcher-linux-ia32: . $(ELECTRON_PACKAGER) . $(APPLICATION_NAME) \ --platform=linux \ --arch=ia32 \ @@ -25,7 +25,7 @@ release/Etcher-linux-ia32: . --overwrite \ --out=$(dir $@) -release/Etcher-linux-x64: . +etcher-release/Etcher-linux-x64: . $(ELECTRON_PACKAGER) . $(APPLICATION_NAME) \ --platform=linux \ --arch=x64 \ @@ -35,7 +35,7 @@ release/Etcher-linux-x64: . --overwrite \ --out=$(dir $@) -release/Etcher-win32-ia32: . +etcher-release/Etcher-win32-ia32: . $(ELECTRON_PACKAGER) . $(APPLICATION_NAME) \ --platform=win32 \ --arch=ia32 \ @@ -46,7 +46,7 @@ release/Etcher-win32-ia32: . --overwrite \ --out=$(dir $@) -release/Etcher-win32-x64: . +etcher-release/Etcher-win32-x64: . $(ELECTRON_PACKAGER) . $(APPLICATION_NAME) \ --platform=win32 \ --arch=x64 \ @@ -57,48 +57,48 @@ release/Etcher-win32-x64: . --overwrite \ --out=$(dir $@) -release/installers/Etcher.dmg: release/Etcher-darwin-x64 package.json +etcher-release/installers/Etcher.dmg: etcher-release/Etcher-darwin-x64 package.json $(ELECTRON_BUILDER) "$