blob: c77db56bea66fa77590ae2d4046aff2f238abe4e (
plain)
1 --- Makefile.orig 2009-04-14 06:32:42.697920168 +0000
2 +++ Makefile 2009-04-14 06:38:11.489920182 +0000
3 @@ -40,8 +40,7 @@ BTARGET = version.gen version.h version
4 BOBJECTS = $(BTARGET) \
5 mbr/mbr.bin mbr/gptmbr.bin \
6 core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
7 - gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
8 - $(MODULES)
9 + gpxe/gpxelinux.0 dos/syslinux.com $(MODULES)
10
11 # BSUBDIRs build the on-target binary components.
12 # ISUBDIRs build the installer (host) components.
13 @@ -50,7 +49,7 @@ BOBJECTS = $(BTARGET) \
14 # files that depend only on the B phase, but may have to be regenerated
15 # for "make installer".
16 BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
17 - libinstaller dos win32
18 + libinstaller dos
19 ITARGET =
20 IOBJECTS = $(ITARGET) dos/copybs.com \
21 utils/gethostip utils/isohybrid utils/mkdiskimage \
22 @@ -58,26 +57,15 @@ IOBJECTS = $(ITARGET) dos/copybs.com \
23 ISUBDIRS = libinstaller mtools linux extlinux utils
24
25 # Things to install in /usr/bin
26 -INSTALL_BIN = mtools/syslinux
27 -# Things to install in /sbin
28 -INSTALL_SBIN = extlinux/extlinux
29 +INSTALL_BIN = mtools/syslinux extlinux/extlinux
30 # Things to install in /usr/lib/syslinux
31 INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
32 core/isolinux-debug.bin \
33 - dos/syslinux.com dos/copybs.com win32/syslinux.exe \
34 - mbr/*.bin $(MODULES)
35 -INSTALL_AUX_OPT = win32/syslinux.exe
36 + dos/syslinux.com dos/copybs.com mbr/*.bin $(MODULES)
37
38 # These directories manage their own installables
39 INSTALLSUBDIRS = com32 utils
40
41 -# Things to install in /boot/extlinux
42 -EXTBOOTINSTALL = $(MODULES)
43 -
44 -# Things to install in /tftpboot
45 -NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \
46 - $(MODULES)
47 -
48 all:
49 $(MAKE) all-local
50 set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
51 @@ -102,11 +90,8 @@ version.mk: version version.pl
52 local-install: installer
53 mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
54 install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
55 - mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
56 - install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
57 mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
58 install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
59 - -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
60 mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1
61 install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1
62 : mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8
63 @@ -115,15 +100,7 @@ local-install: installer
64 install: local-install
65 set -e ; for i in $(INSTALLSUBDIRS) ; do $(MAKE) -C $$i $@ ; done
66
67 -netinstall: installer
68 - mkdir -p $(INSTALLROOT)$(TFTPBOOT)
69 - install -m 644 $(NETINSTALLABLE) $(INSTALLROOT)$(TFTPBOOT)
70 -
71 -extbootinstall: installer
72 - mkdir -m 755 -p $(INSTALLROOT)$(EXTLINUXDIR)
73 - install -m 644 $(EXTBOOTINSTALL) $(INSTALLROOT)$(EXTLINUXDIR)
74 -
75 -install-all: install netinstall extbootinstall
76 +install-all: install
77
78 local-tidy:
79 rm -f *.o *.elf *_bin.c stupid.* patch.offset
|
