minor fix for configure

This commit is contained in:
NIIBE Yutaka
2016-09-30 16:20:19 +09:00
parent f46880d2a8
commit 47150b5c98
2 changed files with 9 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
2016-09-02 Niibe Yutaka <gniibe@fsij.org>
* src/configure (REVISION): Fix the detection of .git.
It may be a regular file (if it's created by worktree).
2016-08-24 Niibe Yutaka <gniibe@fsij.org>
* test/features/steps.py (ini): Use GLC (the global context),

6
src/configure vendored
View File

@@ -45,7 +45,7 @@ certdo=no
hid_card_change=no
# Revision number
if test -d ../.git; then
if test -e ../.git; then
REVISION=`git describe --dirty="-modified"`
else
REVISION=`cat ../VERSION`
@@ -111,6 +111,7 @@ Configuration:
--target=TARGET specify target [FST_01]
supported targets are:
FST_01
FST_01G
OLIMEX_STM32_H103
STM32_PRIMER2
STBEE
@@ -189,7 +190,8 @@ fi
# --with-dfu option
if test "$with_dfu" = "yes"; then
if test "$target" = "FST_01" -o "$target" = "FST_01_00"; then
if test "$target" = "FST_01" -o "$target" = "FST_01G" \
-o "$target" = "FST_01_00"; then
echo "FST-01 doesn't have DFU loader, you should not use --with-dfu." >&2
exit 1
fi