projects
/
pyfrprog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0654652
)
make: check if git is available before calculate version
master
author
Bernhard Urban
<lewurm@gmail.com>
Fri, 7 May 2010 14:29:18 +0000
(16:29 +0200)
committer
Bernhard Urban
<lewurm@gmail.com>
Fri, 7 May 2010 14:29:18 +0000
(16:29 +0200)
Makefile
patch
|
blob
|
history
pkernel/Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 1d5095b4f3fd08124299b086664c6d895e9722c1..ee3cabe31e89ec3a0ef6fa6417356fd079689814 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,11
+1,17
@@
PREFIX = /usr
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:
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
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 66e4598ce5e3f02123a9a0cc6b92c57872cbbdbc..37e74d58a2dd9c0200a2b6446801001555267e6a 100644
(file)
--- a/
pkernel/Makefile
+++ b/
pkernel/Makefile
@@
-55,7
+55,7
@@
LD = $(PREFIX)flnk911s
LIBR = $(PREFIX)flibs
CONV = $(PREFIX)f2ms
LIBR = $(PREFIX)flibs
CONV = $(PREFIX)f2ms
-if
neq ($(shell which dos2unix),
)
+if
eq ($(shell which fromdos > /dev/null 2> /dev/null; echo $$?),1
)
D2U = dos2unix
else
D2U = fromdos
D2U = dos2unix
else
D2U = fromdos