- update the Makefile for releases

- remove references to old plex86 website
- update the Makefile so it build VGABIOS-lgpl-latest.bin and
  VGABIOS-lgpl-latest.debug.bin

3 files changed, 20 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 6bc02a3..a4945df 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ LDFLAGS =
 
 RELEASE = `pwd | sed "s-.*/--"`
 RELDATE = `date '+%d %b %Y'`
+RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios// | sed s/-//"`
+
+VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
 
 all: bios
 
@@ -14,31 +17,32 @@ bios: vgabios.bin vgabios.debug.bin
 
 clean:
 	/bin/rm -f  *.o *.s *.ld86 \
-          temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin $(RELEASE).bin
+          temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin
 
 dist-clean: clean
 
-release: bios
+release: 
+	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios
 	/bin/rm -f  *.o *.s *.ld86 \
           temp.awk.* vgabios.*.orig _vgabios_.*.c core
-	cp vgabios.bin ../$(RELEASE).bin
-	cp vgabios.debug.bin ../$(RELEASE).debug.bin
-	rm vgabios.bin 
-	rm vgabios.debug.bin
+	cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin
+	cp VGABIOS-lgpl-latest.debug.bin ../$(RELEASE).debug.bin
 	tar czvf ../$(RELEASE).tgz -C .. $(RELEASE)/
 
 vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
-	gcc -E vgabios.c -DVBE -DVGABIOS_DATE="\"$(RELDATE)\"" > _vgabios_.c
+	gcc -E vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
 	bcc -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
 	as86 _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
 	rm -f _vgabios_.s _vgabios_.c vgabios.s
-	ls -l vgabios.bin
+	mv vgabios.bin VGABIOS-lgpl-latest.bin
+	ls -l VGABIOS-lgpl-latest.bin
 
 vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
-	gcc -E vgabios.c -DVBE -DDEBUG -DVGABIOS_DATE="\"$(RELDATE)\"" > _vgabios-debug_.c
+	gcc -E vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
 	bcc -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
 	as86 _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
 	rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
-	ls -l vgabios.debug.bin
+	mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
+	ls -l VGABIOS-lgpl-latest.debug.bin
diff --git a/README b/README
index 71395a3..d734d21 100644
--- a/README
+++ b/README
@@ -79,5 +79,4 @@ Please report any bugs, comments, patches for this VGA Bios to cbothamy@free.fr
 
 You can find the latest release at : http://cbothamy.free.fr/projects/vgabios/
 
-For any information on plex86, visit the website http://www.plex86.org/
 For any information on bochs, visit the website http://bochs.sourceforge.net/
diff --git a/vgabios.c b/vgabios.c
index 055310c..9642b4f 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -186,7 +186,11 @@ vgabios_name:
 .byte   0x00
 
 vgabios_version:
+#ifndef VGABIOS_VERS
 .ascii	"current-cvs"
+#else
+.ascii VGABIOS_VERS
+#endif
 .ascii	" "
 
 vgabios_date:
@@ -208,8 +212,8 @@ vgabios_license:
 vgabios_website:
 .ascii	"Please visit :"
 .byte	0x0a,0x0d
-.ascii  " . http://www.plex86.org"
-.byte	0x0a,0x0d
+;;.ascii  " . http://www.plex86.org"
+;;.byte	0x0a,0x0d
 .ascii	" . http://bochs.sourceforge.net"
 .byte	0x0a,0x0d
 .ascii	" . http://www.nongnu.org/vgabios"