diff --git a/Makefile b/Makefile index 8002ccb..7d40c9e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ EMACS ?= emacs SHELL = bash + CASK ?= $(shell command -v cask) ifeq ($(CASK),) $(error "Install cask (https://github.com/cask/cask)") @@ -41,11 +42,11 @@ test: zmq compile .PHONY: clean clean: make -C js clean - rm $(ELCFILES) + @rm $(ELCFILES) 2>/dev/null || true .PHONY: clean-cask clean-cask: - rm -rf .cask/ + @rm -rf .cask/ 2>/dev/null || true .PHONY: widgets widgets: diff --git a/js/Makefile b/js/Makefile index 20335ce..f563e3f 100644 --- a/js/Makefile +++ b/js/Makefile @@ -1,3 +1,5 @@ +SHELL = bash + NPM ?= $(shell command -v npm) ifeq ($(NPM),) $(error "Node not installed (https://nodejs.org/en/)") @@ -14,10 +16,10 @@ endif all: build clean: - rm -rf built/ + @rm -rf built/ 2>/dev/null || true really-clean: clean - rm -rf node_modules + @rm -rf node_modules 2>/dev/null || true build: built/index.built.js