--- 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
 BOBJECTS = $(BTARGET) \
 	mbr/mbr.bin mbr/gptmbr.bin \
 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
-	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
+	gpxe/gpxelinux.0 dos/syslinux.com \
 	memdisk/memdisk memdump/memdump.com
 
 # BSUBDIRs build the on-target binary components.
@@ -45,23 +45,22 @@ 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  = 
 IOBJECTS = $(ITARGET) dos/copybs.com utils/gethostip utils/mkdiskimage \
 	mtools/syslinux linux/syslinux extlinux/extlinux
 ISUBDIRS = libinstaller mtools linux extlinux utils
 
 # Things to install in /usr/bin
-INSTALL_BIN   =	mtools/syslinux
-# 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 \
 		memdisk/memdisk memdump/memdump.com \
 		mbr/mbr.bin mbr/gptmbr.bin
-INSTALL_AUX_OPT = win32/syslinux.exe
+INSTALL_AUX_OPT = 
 
 # These directories manage their own installables
 INSTALLSUBDIRS = com32 utils
@@ -97,8 +96,6 @@ version.h: version version.pl
 local-install: installer
 	mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
 	install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
-	mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
-	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)