diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-22 09:38:43 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-22 09:38:43 -0800 |
| commit | 2b164fd1078bc9640836f15598ed901cc7a31ae2 (patch) | |
| tree | 05c661adf5920b2408fbd1961b3bd855c75732d8 /Makefile | |
| parent | 8492da661cc77e26cd18e4cf307b78e50661ea29 (diff) | |
| parent | e535becb865292360e808996409c1513df7d2be7 (diff) | |
| download | syslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.tar.gz | |
Merge branch 'master' into fsc
Resolved Conflicts:
com32/Makefile
com32/lib/sys/open.c
com32/modules/Makefile
dos/Makefile
dos/com16.ld
dos/syslinux.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -32,7 +32,7 @@ include $(topdir)/MCONFIG # List of module objects that should be installed for all derivatives MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \ - com32/hdt/*.c32 com32/rosh/*.c32 + com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 # syslinux.exe is BTARGET so as to not require everyone to have the # mingw suite installed |