aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2011-03-18 08:13:27 +0100
committerMichal Soltys <soltys@ziu.info>2011-03-18 08:13:27 +0100
commita507a1561d11c9aa0eb9d23bc3008f58248c8b4b (patch)
treedd89a54c91c3e9c77bcc9d9bc3bcd1fc9889c929 /Makefile
parentbaf972d7677a911b600d849c4e04ebf76d71b36b (diff)
parent239fed5bbdab41643af2d119107023ec3e0d8a3c (diff)
downloadsyslinux-a507a1561d11c9aa0eb9d23bc3008f58248c8b4b.tar.gz
syslinux-a507a1561d11c9aa0eb9d23bc3008f58248c8b4b.tar.xz
syslinux-a507a1561d11c9aa0eb9d23bc3008f58248c8b4b.zip
Merge branch 'master' into chaindev
Conflicts: com32/modules/chain.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 9ab401b6..c4a24c40 100644
--- a/Makefile
+++ b/Makefile
@@ -39,9 +39,7 @@ MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \
# mingw suite installed
BTARGET = version.gen version.h version.mk
BOBJECTS = $(BTARGET) \
- mbr/mbr.bin mbr/altmbr.bin mbr/gptmbr.bin \
- mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
+ mbr/*.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
gpxe/gpxelinux.0 dos/syslinux.com \
win32/syslinux.exe win64/syslinux64.exe \
@@ -55,7 +53,7 @@ BOBJECTS = $(BTARGET) \
# files that depend only on the B phase, but may have to be regenerated
# for "make installer".
BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
- libinstaller dos win32 win64 dosutil
+ diag libinstaller dos win32 win64 dosutil
ITARGET =
IOBJECTS = $(ITARGET) \
utils/gethostip utils/isohybrid utils/mkdiskimage \
@@ -67,11 +65,13 @@ INSTALL_BIN = mtools/syslinux
# Things to install in /sbin
INSTALL_SBIN = extlinux/extlinux
# Things to install in /usr/lib/syslinux
-INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
- core/isolinux-debug.bin \
+INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
+ core/isolinux.bin core/isolinux-debug.bin \
dos/syslinux.com \
mbr/*.bin $(MODULES)
INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe
+INSTALL_DIAG = diag/mbr/handoff.bin \
+ diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz
# These directories manage their own installables
INSTALLSUBDIRS = com32 utils dosutil
@@ -112,6 +112,8 @@ local-install: installer
mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
-install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
+ mkdir -m 755 -p $(INSTALLROOT)$(DIAGDIR)
+ install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)
mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1
install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1
: mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8