summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-15 15:04:37 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-15 15:04:37 +0000
commit8841d3e703e3d3f7c7920b7f9439fc9333c15638 (patch)
tree6882ad326234c32f0af130afede47c17a910a181 /Makefile
parent316a29f33f7b4f549097c102cf2e56a30d7e3cac (diff)
downloadast2050-flashrom-8841d3e703e3d3f7c7920b7f9439fc9333c15638.zip
ast2050-flashrom-8841d3e703e3d3f7c7920b7f9439fc9333c15638.tar.gz
Fix assorted documentation, frontend and printing bugs
Change the command line interface to make file names positional. Add more sanity checks to the command line parser. Corresponding to flashrom svn r998. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 31fc858..147d385 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ all: pciutils features dep $(PROGRAM)
# of the checked out flashrom files.
# Note to packagers: Any tree exported with "make export" or "make tarball"
# will not require subversion. The downloadable snapshots are already exported.
-SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" || LC_ALL=C svn info . | grep ^Revision | sed "s/.*[[:blank:]]\+\([0-9]*\)[^0-9]*/\1/" | grep "[0-9]" || echo unknown)
+SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown)
RELEASE := 0.9.1
VERSION := $(RELEASE)-r$(SVNVERSION)
OpenPOWER on IntegriCloud