From 8b21242b0c9c87e4308cfdb8bc9c73d3b004ed0b Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 9 Dec 2009 19:57:56 -0800
Subject: [PATCH] Makefile: add DOS utilities as installables

Add the DOS utilities as auxilliary installables

In case someone wants them...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 Makefile         | 5 +++--
 dosutil/Makefile | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c964e8d..d0f5e71 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ BOBJECTS = $(BTARGET) \
 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
 	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
+	dosutil/*.com dosutil/*.sys \
 	$(MODULES)
 
 # BSUBDIRs build the on-target binary components.
@@ -52,7 +53,7 @@ BOBJECTS = $(BTARGET) \
 # files that depend only on the B phase, but may have to be regenerated
 # for "make installer".
 BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
-	   libinstaller dos win32
+	   libinstaller dos win32 dosutil
 ITARGET  =
 IOBJECTS = $(ITARGET) dos/copybs.com \
 	utils/gethostip utils/isohybrid utils/mkdiskimage \
@@ -71,7 +72,7 @@ INSTALL_AUX   =	core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
 INSTALL_AUX_OPT = win32/syslinux.exe
 
 # These directories manage their own installables
-INSTALLSUBDIRS = com32 utils
+INSTALLSUBDIRS = com32 utils dosutil
 
 # Things to install in /boot/extlinux
 EXTBOOTINSTALL = $(MODULES)
diff --git a/dosutil/Makefile b/dosutil/Makefile
index f3f90b3..ecb695a 100644
--- a/dosutil/Makefile
+++ b/dosutil/Makefile
@@ -1,6 +1,9 @@
 #
 # OpenWatcom compile and link utility
 #
+topdir = ..
+include $(topdir)/MCONFIG
+
 WCL	= wcl
 WCLOPT	= -6 -osx -mt -bt=DOS -l=COM
 
@@ -42,4 +45,7 @@ clean: tidy
 spotless: clean
 	-rm -f *.com *.sys *~
 
+installer: all
 
+install: installer
+	install -m 644 $(TARGETS) $(INSTALLROOT)$(AUXDIR)
-- 
2.7.4