aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-27 11:55:23 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-27 11:55:23 -0800
commit99919ef6c96e743ae610434f6ea7ac78bd7caa97 (patch)
tree708e2f98f04882baefabffe6c971ff166af2b6e8
parentfc7c93a512f03a4ac912d4c16c3e601e199864a2 (diff)
downloadsyslinux-elf-99919ef6c96e743ae610434f6ea7ac78bd7caa97.tar.gz
syslinux-elf-99919ef6c96e743ae610434f6ea7ac78bd7caa97.tar.xz
syslinux-elf-99919ef6c96e743ae610434f6ea7ac78bd7caa97.zip
Use YEAR, not the obsolete macro year
-rw-r--r--core/config.inc5
-rw-r--r--core/extlinux.asm2
-rw-r--r--core/isolinux.asm2
-rw-r--r--core/ldlinux.asm2
-rw-r--r--core/pxelinux.asm2
5 files changed, 4 insertions, 9 deletions
diff --git a/core/config.inc b/core/config.inc
index 8dd9ca6f..8ac77758 100644
--- a/core/config.inc
+++ b/core/config.inc
@@ -48,9 +48,4 @@ MAX_FKEYS equ 12 ; Number of F-key help files
;
%include "../version.gen"
-;
-; Copyright year...
-;
-%define year '2008'
-
%endif ; _CONFIG_INC
diff --git a/core/extlinux.asm b/core/extlinux.asm
index c7a51e94..a3cb3af1 100644
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -1551,7 +1551,7 @@ build_curdir_str:
; -----------------------------------------------------------------------------
section .data
-copyright_str db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
+copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
db CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
db 'a key to continue.', CR, LF, 0
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 2c6d9702..764ba7d3 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -1027,7 +1027,7 @@ writestr_early equ writestr
; -----------------------------------------------------------------------------
syslinux_banner db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0
-copyright_str db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
+copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
db CR, LF, 0
isolinux_str db 'isolinux: ', 0
%ifdef DEBUG_MESSAGES
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index da1ddde2..d911e9f5 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -2049,7 +2049,7 @@ getfatsector:
; -----------------------------------------------------------------------------
section .data
-copyright_str db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
+copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
db CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: please change disks and press '
db 'a key to continue.', CR, LF, 0
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index a660bd6c..8229be08 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -2694,7 +2694,7 @@ writestr_early equ writestr
section .data
-copyright_str db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
+copyright_str db ' Copyright (C) 1994-', YEAR, ' H. Peter Anvin'
db CR, LF, 0
err_bootfailed db CR, LF, 'Boot failed: press a key to retry, or wait for reset...', CR, LF, 0
bailmsg equ err_bootfailed