summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-16 21:11:52 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-03-16 21:11:52 -0700
commit8f3919c8f5dd37ccd3b7565d32ef1dac8b2522d5 (patch)
treeeba035188c44d3f8562eba14b1898fb700f3edf4
parent67ede4c57a1a2e8e1964bb709e443b85d78fcab3 (diff)
downloadsyslinux-8f3919c8f5dd37ccd3b7565d32ef1dac8b2522d5.tar.gz
memdisk: memdisk16.asm needs %ifndef DEPEND around %include
Older versions of NASM puke if there is an %include of a non-existent file during dependency generation. Make it more forgiving.
-rw-r--r--memdisk/memdisk16.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/memdisk/memdisk16.asm b/memdisk/memdisk16.asm
index d43404e8..83d4c6cc 100644
--- a/memdisk/memdisk16.asm
+++ b/memdisk/memdisk16.asm
@@ -1,7 +1,7 @@
;; -*- fundamental -*-
;; -----------------------------------------------------------------------
;;
-;; Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;; Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@
;; com32.inc in the main SYSLINUX distribution.
;;
+%ifndef DEPEND
%include '../version.gen'
+%endif
MY_CS equ 0x0800 ; Segment address to use
CS_BASE equ (MY_CS << 4) ; Corresponding address