From 26562698f696c5b5993966dcd5a9aa07d9fc44f5 Mon Sep 17 00:00:00 2001
From: Bernhard Urban <lewurm@gmail.com>
Date: Fri, 7 May 2010 16:29:18 +0200
Subject: [PATCH] make: check if git is available before calculate version

---
 Makefile         | 8 +++++++-
 pkernel/Makefile | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1d5095b..ee3cabe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,17 @@
 PREFIX = /usr
 
+ifeq ($(shell which git > /dev/null 2> /dev/null; echo $$?),0)
+VERSION = $(shell git describe --abbrev=6)
+else
+VERSION = v0.1-XXX
+endif
+
 all:
 	make -C pkernel/
 
 #install: all #this just work when $FUJDEV is set for root too, eh?
 install:
-	sed -e 's/%PREFIX%/\$(PREFIX)/g' frprog.py | sed -e 's/%VERSION%/$(shell git describe --abbrev=6)/g'> $(PREFIX)/bin/frprog
+	sed -e 's/%PREFIX%/\$(PREFIX)/g' frprog.py | sed -e 's/%VERSION%/$(VERSION)/g'> $(PREFIX)/bin/frprog
 	cp SerialPort_linux.py $(PREFIX)/bin/SerialPort_linux.py
 	mkdir -p $(PREFIX)/share/frprog/
 	cp pkernel/pkernel.mhx $(PREFIX)/share/frprog/pkernel.mhx
diff --git a/pkernel/Makefile b/pkernel/Makefile
index 66e4598..37e74d5 100644
--- a/pkernel/Makefile
+++ b/pkernel/Makefile
@@ -55,7 +55,7 @@ LD = $(PREFIX)flnk911s
 LIBR = $(PREFIX)flibs
 CONV = $(PREFIX)f2ms
 
-ifneq ($(shell which dos2unix),)
+ifeq ($(shell which fromdos > /dev/null 2> /dev/null; echo $$?),1)
 D2U = dos2unix
 else
 D2U = fromdos
-- 
2.25.1