From d6828c284a325b42acfa9c4ba4fffb1a7aca408c Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 14 Mar 2012 06:58:57 +0000 Subject: [PATCH] Don't use the BUILD_DIR for SVN_STR. --- src/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9083296d8..ade44f2f9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -550,9 +550,6 @@ ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) $(AVRGCCFLAGS) MAJ_VER = ${shell sh -c "grep \"MAJ_VERS\" open9x.h | cut -d\ -f3 | egrep -o \"[[:digit:]]\""} MIN_VER = ${shell sh -c "grep \"MIN_VERS\" open9x.h | cut -d\ -f3"} -ABUILD_NUM = ${shell sh -c "grep \"BUILD_NUM\" stamp-open9x.h | egrep -o \"[[:digit:]]+\""} -BUILD_NUM = $(shell echo $$(( $(ABUILD_NUM) + 1 ))) -BUILD_DIR = $(shell pwd | awk -F'/' '{print $$((NF-1))}') # Default target. all: begin gccversion sizebefore build sizeafter end @@ -574,14 +571,14 @@ stamp_header: @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" >> stamp-open9x.h @echo "#define TIME_STR \"`date +%H:%I:%S`\"" >> stamp-open9x.h @echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)-$(MODS)\"" >> stamp-open9x.h - @echo "#define SVN_STR \"$(BUILD_DIR)-r$(REV)\"" >> stamp-open9x.h + @echo "#define SVN_STR \"open9x-r$(REV)\"" >> stamp-open9x.h @cat stamp-open9x.h stamp: @echo "#define DATE_STR \"`date +%Y-%m-%d`\"" > ../stamp-open9x.txt @echo "#define TIME_STR \"`date +%H:%I:%S`\"" >> ../stamp-open9x.txt @echo "#define VERS_STR \"$(MAJ_VER).$(MIN_VER)\"" >> ../stamp-open9x.txt - @echo "#define SVN_VERS \"$(BUILD_DIR)-r$(REV)\"" >> ../stamp-open9x.txt + @echo "#define SVN_VERS \"open9x-r$(REV)\"" >> ../stamp-open9x.txt @cat ../stamp-open9x.txt font.lbm: font_6x1.xbm