pandora: workaround some reported problems

[picodrive.git] / platform / pandora / Makefile

diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
index c7e7c00..5907169 100644 (file)
--- a/platform/pandora/Makefile
+++ b/platform/pandora/Makefile
@@ -1,7 +1,12 @@
 # release packaging makefile
 
-VER ?= $(shell head -n 1 ../common/version.h | \
+VER := $(shell head -n 1 ../common/version.h | \
        sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
+BUILD := $(shell git describe HEAD | grep -- - | \
+       sed -e 's/.*\-\(.*\)\-.*/\1/')
+ifneq "$(BUILD)" ""
+VER := $(VER)_$(BUILD)
+endif
 
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
@@ -13,8 +18,8 @@ all: rel
 /tmp/readme.txt: ../../tools/textfilter ../base_readme.txt
        ../../tools/textfilter ../base_readme.txt $@ PANDORA
 
-/tmp/PicoDrive.pxml: PicoDrive.pxml.template
-       ./make_pxml.sh $^ $@
+/tmp/PicoDrive.pxml: PicoDrive.pxml.template FORCE
+       ./make_pxml.sh $< $@
 
 rel: ../../PicoDrive PicoDrive.sh picorestore \
        PicoDrive.png PicoDrive_p.png \
@@ -25,3 +30,5 @@ rel: ../../PicoDrive PicoDrive.sh picorestore \
        cp -r $^ out/
        $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c
 
+FORCE:
+.PHONY: all rel FORCE