From fd40500625723610a9abe7fb20775da4d88ca4dc Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 7 Jul 2008 15:00:56 -0700
Subject: Drop macros that just point to other macros

Drop macros for "date" and "version_str", which are nothing but
redefined names of macros we already define (DATE_STR and VERSION).
---
 core/config.inc   | 4 +---
 core/extlinux.asm | 2 +-
 core/isolinux.asm | 2 +-
 core/ldlinux.asm  | 2 +-
 core/pxelinux.asm | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/config.inc b/core/config.inc
index f696f291..9ff7b85b 100644
--- a/core/config.inc
+++ b/core/config.inc
@@ -51,10 +51,8 @@ MAX_FKEYS	equ 12			; Number of F-key help files
 %endif
 
 ;
-; Should be updated with every release to avoid bootsector/SYS file mismatch
+; Copyright year...
 ;
-%define	version_str	VERSION		; Must be 4 characters long!
-%define date		DATE_STR	; Defined from the Makefile
 %define	year		'2008'
 
 %endif ; _CONFIG_INC
diff --git a/core/extlinux.asm b/core/extlinux.asm
index bacb8a28..d4fc9cd9 100644
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -565,7 +565,7 @@ ldlinux_sys:
 
 syslinux_banner	db 0Dh, 0Ah
 		db 'EXTLINUX '
-		db version_str, ' ', date, ' ', 0
+		db VERSION, ' ', DATE_STR, ' ', 0
 		db 0Dh, 0Ah, 1Ah	; EOF if we "type" this in DOS
 
 		align 8, db 0
diff --git a/core/isolinux.asm b/core/isolinux.asm
index a3eb9ee5..a3871835 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -795,7 +795,7 @@ writestr_early	equ writestr
 ; Data that needs to be in the first sector
 ; -----------------------------------------------------------------------------
 
-syslinux_banner	db CR, LF, 'ISOLINUX ', version_str, ' ', date, ' ', 0
+syslinux_banner	db CR, LF, 'ISOLINUX ', VERSION, ' ', DATE_STR, ' ', 0
 copyright_str   db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
 		db CR, LF, 0
 isolinux_str	db 'isolinux: ', 0
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index 2be865da..8fed9b37 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -588,7 +588,7 @@ syslinux_banner	db 0Dh, 0Ah
 %else
 		db 'SYSLINUX '
 %endif
-		db version_str, ' ', date, ' ', 0
+		db VERSION, ' ', DATE_STR, ' ', 0
 		db 0Dh, 0Ah, 1Ah	; EOF if we "type" this in DOS
 
 		align 8, db 0
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 812bbeb2..c6a092cd 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -2727,7 +2727,7 @@ localboot_msg	db 'Booting from local disk...', CR, LF, 0
 trying_msg	db 'Trying to load: ', 0
 fourbs_msg	db BS, BS, BS, BS, 0
 default_str	db 'default', 0
-syslinux_banner	db CR, LF, 'PXELINUX ', version_str, ' ', date, ' ', 0
+syslinux_banner	db CR, LF, 'PXELINUX ', VERSION, ' ', DATE_STR, ' ', 0
 cfgprefix	db 'pxelinux.cfg/'		; No final null!
 cfgprefix_len	equ ($-cfgprefix)
 
-- 
cgit v1.2.1