diff --git a/deploy/Makefile b/deploy/Makefile index 38158c95ef10af56bae864f0be742db1c5d9a33f..d25cd2c913eb00b4bbf5c40a405426fa3e599247 100644 --- a/deploy/Makefile +++ b/deploy/Makefile @@ -1,5 +1,7 @@ all: install_gulp @ +install: install_gulp + install_gulp: $(MAKE) build -C ./gulp diff --git a/deploy/gulp/Makefile b/deploy/gulp/Makefile index 5e7e2cda7d494fa153076d8b1242611090f79dc6..163c3a37d50f3a71701826a03c203712cc6f464d 100644 --- a/deploy/gulp/Makefile +++ b/deploy/gulp/Makefile @@ -2,11 +2,7 @@ GULP_DEP := gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-auto INSTALL_PATH := ../ LOCAL_FLAGS := --save-dev --prefix $(INSTALL_PATH) -build: global $(GULP_DEP) - @ - -global: +build: npm install -g gulp + npm install $(LOCAL_FLAGS) $(GULP_DEP) -%: - npm install $(LOCAL_FLAGS) $@ diff --git a/deploy/gulp/gulp-install.bat b/deploy/gulp/gulp-install.bat index d1733260a6928bedaff759288b5cad96f235bd33..be1c5eb683da762ba357d8c99a1ff2b5381ef524 100644 --- a/deploy/gulp/gulp-install.bat +++ b/deploy/gulp/gulp-install.bat @@ -1,7 +1,2 @@ call npm install -g gulp -call npm install --save-dev --prefix ../ gulp -call npm install --save-dev --prefix ../ gulp-rename -call npm install --save-dev --prefix ../ gulp-concat-css -call npm install --save-dev --prefix ../ gulp-minify-css -call npm install --save-dev --prefix ../ gulp-less -call npm install --save-dev --prefix ../ gulp-autoprefixer +call npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer diff --git a/deploy/gulp/gulp-install.sh b/deploy/gulp/gulp-install.sh index 0d9effd9a6064b328d63cc8b948f729c409ced23..abecf162fd3ec709ecf3def82e616f6553ab19e2 100644 --- a/deploy/gulp/gulp-install.sh +++ b/deploy/gulp/gulp-install.sh @@ -1,7 +1,2 @@ npm install -g gulp -npm install --save-dev --prefix ../ gulp -npm install --save-dev --prefix ../ gulp-rename -npm install --save-dev --prefix ../ gulp-concat-css -npm install --save-dev --prefix ../ gulp-minify-css -npm install --save-dev --prefix ../ gulp-less -npm install --save-dev --prefix ../ gulp-autoprefixer +npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer