diff options
| author | Jose V Beneyto <sepen@users.sourceforge.net> | 2008-08-01 19:30:38 +0200 |
|---|---|---|
| committer | Jose V Beneyto <sepen@users.sourceforge.net> | 2008-08-01 19:30:51 +0200 |
| commit | 20a05e81cc757be7dc5bb35a0ed0b8615edbb115 (patch) | |
| tree | ec74110f56858e623db45ac754ce30abc95fe0bd /syslinux/Makefile.patch | |
| parent | e238fc2f23f265d0410df8c889271b14309a1fe2 (diff) | |
| download | contrib-20a05e81cc757be7dc5bb35a0ed0b8615edbb115.tar.gz contrib-20a05e81cc757be7dc5bb35a0ed0b8615edbb115.tar.xz | |
syslinux: Updated 3.70 -> 3.71
Diffstat (limited to 'syslinux/Makefile.patch')
| -rw-r--r-- | syslinux/Makefile.patch | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/syslinux/Makefile.patch b/syslinux/Makefile.patch index d253de441..ebc1e6b30 100644 --- a/syslinux/Makefile.patch +++ b/syslinux/Makefile.patch @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-07-01 15:45:05.000000000 +0200 -+++ Makefile 2008-07-01 15:51:49.000000000 +0200 -@@ -35,7 +35,7 @@ BTARGET = version.gen version.h +--- Makefile.orig 2008-08-01 18:45:23.000000000 +0200 ++++ Makefile 2008-08-01 19:21:48.000000000 +0200 +@@ -34,7 +34,7 @@ BTARGET = version.gen version.h version BOBJECTS = $(BTARGET) \ mbr/mbr.bin mbr/gptmbr.bin \ core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ @@ -9,13 +9,13 @@ memdisk/memdisk memdump/memdump.com # BSUBDIRs build the on-target binary components. -@@ -45,23 +45,22 @@ BOBJECTS = $(BTARGET) \ +@@ -44,35 +44,25 @@ BOBJECTS = $(BTARGET) \ # files that depend only on the B phase, but may have to be regenerated # for "make installer". BSUBDIRS = codepage core memdisk com32 mbr memdump gpxe sample \ - libinstaller dos win32 + libinstaller dos - ITARGET = + ITARGET = IOBJECTS = $(ITARGET) dos/copybs.com utils/gethostip utils/mkdiskimage \ mtools/syslinux linux/syslinux extlinux/extlinux ISUBDIRS = libinstaller mtools linux extlinux utils @@ -25,20 +25,31 @@ -# Things to install in /sbin -INSTALL_SBIN = extlinux/extlinux +INSTALL_BIN = mtools/syslinux extlinux/extlinux -+ # Things to install in /usr/lib/syslinux INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \ core/isolinux-debug.bin \ -- dos/syslinux.com dos/copybs.com win32/syslinux.exe \ -+ dos/syslinux.com dos/copybs.com \ + dos/syslinux.com dos/copybs.com win32/syslinux.exe \ memdisk/memdisk memdump/memdump.com \ - mbr/mbr.bin mbr/gptmbr.bin +- mbr/mbr.bin mbr/gptmbr.bin -INSTALL_AUX_OPT = win32/syslinux.exe -+INSTALL_AUX_OPT = ++ mbr/mbr.bin mbr/gptmbr.bin \ ++ com32/menu/*.c32 com32/modules/*.c32 # These directories manage their own installables INSTALLSUBDIRS = com32 utils -@@ -97,8 +96,6 @@ version.h: version version.pl + +-# Things to install in /boot/extlinux +-EXTBOOTINSTALL = memdisk/memdisk memdump/memdump.com \ +- com32/menu/*.c32 com32/modules/*.c32 +- +-# Things to install in /tftpboot +-NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 memdisk/memdisk \ +- memdump/memdump.com com32/menu/*.c32 com32/modules/*.c32 +- + all: + $(MAKE) all-local + set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done +@@ -97,11 +87,8 @@ version.mk: version version.pl local-install: installer mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR) @@ -46,4 +57,24 @@ - install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR) mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR) install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR) - -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR) +- -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR) + mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1 + install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1 + : mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8 +@@ -110,15 +97,7 @@ local-install: installer + install: local-install + set -e ; for i in $(INSTALLSUBDIRS) ; do $(MAKE) -C $$i $@ ; done + +-netinstall: installer +- mkdir -p $(INSTALLROOT)$(TFTPBOOT) +- install -m 644 $(NETINSTALLABLE) $(INSTALLROOT)$(TFTPBOOT) +- +-extbootinstall: installer +- mkdir -m 755 -p $(INSTALLROOT)$(EXTLINUXDIR) +- install -m 644 $(EXTBOOTINSTALL) $(INSTALLROOT)$(EXTLINUXDIR) +- +-install-all: install netinstall extbootinstall ++install-all: install + + local-tidy: + rm -f *.o *.elf *_bin.c stupid.* patch.offset |