From 6f48312ff696f8ac95cf05f1b3466fd7203ef267 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Wed, 19 Feb 2014 00:02:47 +0100 Subject: [PATCH] Support both "/usr/bin/nodejs" and "/usr/bin/node" when compiling JavaScript. --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d9ca1c93..851df34c 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,13 @@ DIST := $(CURDIR)/dist_$(BUILD_ARCH) DIST_SRC := $(DIST)/src DIST_BIN := $(DIST)/bin +NODEJS_BIN_EXISTS := $(shell [ -x /usr/bin/nodejs ] && echo 1 || echo 0) +ifeq ($(NODEJS_BIN_EXISTS), 1) + NODEJS_BIN := /usr/bin/nodejs +else + NODEJS_BIN := /usr/bin/node +endif + build: get binary styles javascript gopath: @@ -65,7 +72,7 @@ styles: javascript: mkdir -p $(OUTPUT_JS) - nodejs $(CURDIR)/build/r.js -o $(CURDIR)/build/build.js dir=$(OUTPUT_JS) baseUrl=$(CURDIR)/static/js mainConfigFile=$(CURDIR)/static/js/main.js + $(NODEJS_BIN) $(CURDIR)/build/r.js -o $(CURDIR)/build/build.js dir=$(OUTPUT_JS) baseUrl=$(CURDIR)/static/js mainConfigFile=$(CURDIR)/static/js/main.js release: GOPATH = "$(DIST):$(CURDIR)" release: LDFLAGS = -X main.version $(VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE)