blob: 0f7d13d48f7aef615e86a29396b8e7f2d2a4a6c9 (
plain)
1 --- Makefile.orig 2014-12-05 09:11:40.322312104 +0000
2 +++ Makefile 2014-12-05 11:47:22.202207109 +0000
3 @@ -15,7 +15,7 @@
4 # Main Makefile for SYSLINUX
5 #
6
7 -all_firmware := bios efi32 efi64
8 +all_firmware := bios efi64
9
10 #
11 # topdir is only set when we are doing a recursive make. Do a bunch of
12 @@ -163,8 +163,6 @@ BOBJECTS = $(BTARGET) \
13 core/pxelinux.0 core/lpxelinux.0 \
14 core/isolinux.bin core/isolinux-debug.bin \
15 gpxe/gpxelinux.0 dos/syslinux.com \
16 - win32/syslinux.exe win64/syslinux64.exe \
17 - dosutil/*.com dosutil/*.sys \
18 $(MODULES)
19
20 # BSUBDIRs build the on-target binary components.
21 @@ -186,7 +184,7 @@ NETINSTALLABLE = efi/syslinux.efi $(INST
22 else
23
24 BSUBDIRS = codepage com32 lzo core memdisk mbr gpxe sample \
25 - diag libinstaller dos win32 win64 dosutil txt
26 + libinstaller txt
27
28 ITARGET =
29 IOBJECTS = $(ITARGET) \
30 @@ -195,20 +193,20 @@ IOBJECTS = $(ITARGET) \
31 ISUBDIRS = libinstaller mtools linux extlinux utils
32
33 # Things to install in /usr/bin
34 -INSTALL_BIN = mtools/syslinux
35 +INSTALL_BIN = mtools/syslinux extlinux/extlinux
36 # Things to install in /sbin
37 -INSTALL_SBIN = extlinux/extlinux
38 +INSTALL_SBIN =
39 # Things to install in /usr/lib/syslinux
40 INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
41 core/isolinux.bin core/isolinux-debug.bin \
42 - dos/syslinux.com core/lpxelinux.0 \
43 + core/lpxelinux.0 \
44 mbr/*.bin $(INSTALLABLE_MODULES)
45 -INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe
46 +INSTALL_AUX_OPT =
47 INSTALL_DIAG = diag/mbr/handoff.bin \
48 diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz
49
50 # These directories manage their own installables
51 -INSTALLSUBDIRS = com32 utils dosutil
52 +INSTALLSUBDIRS = com32 utils
53
54 # Things to install in /boot/extlinux
55 EXTBOOTINSTALL = $(INSTALLABLE_MODULES)
56 @@ -329,8 +327,6 @@ version.h: $(topdir)/version $(topdir)/v
57 local-install: installer
58 mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
59 install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
60 - mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
61 - install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
62 mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
63 install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
64 -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
|
