X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=extra%2Fnanopb.mk;h=7576baeef68ec9db3f4ba8db68964207bee8eb5f;hb=10ef575d467db1f12406eee944212fde6c250089;hp=b52c78c1e36ae5e060cc4dde49f749597e80ff0f;hpb=45c1a32e5046fe9323d4fd0213b474a554b2bbed;p=apps%2Fagl-service-can-low-level.git

diff --git a/extra/nanopb.mk b/extra/nanopb.mk
index b52c78c1..7576baee 100644
--- a/extra/nanopb.mk
+++ b/extra/nanopb.mk
@@ -7,6 +7,14 @@ NANOPB_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../)
 # Files for the nanopb core
 NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c
 
+# Check if we are running on Windows
+ifdef windir
+WINDOWS = 1
+endif
+ifdef WINDIR
+WINDOWS = 1
+endif
+
 # Check whether to use binary version of nanopb_generator or the
 # system-supplied python interpreter.
 ifneq "$(wildcard $(NANOPB_DIR)/generator-bin)" ""
@@ -16,10 +24,10 @@ ifneq "$(wildcard $(NANOPB_DIR)/generator-bin)" ""
 else
 	# Source only or git checkout
 	PROTOC = protoc
-	ifdef windir
-		PROTOC_OPTS = --plugin=nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb.bat
+	ifdef WINDOWS
+		PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb.bat
 	else
-		PROTOC_OPTS = --plugin=nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb
+		PROTOC_OPTS = --plugin=protoc-gen-nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb
 	endif
 endif