From 7aff3692e388cef5058eb7507ae7b266488aea3c Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Wed, 9 Aug 2006 07:51:14 +0000
Subject: [PATCH] Use makedist.mif even in Watcom. Less elegant in some
 respects, but I think it's the right thing.

---
 dos/wccdos16.mak   |  9 ++++++---
 dos/wccdos4g.mak   |  9 ++++++---
 os2/wccos2.mak     |  9 ++++++---
 watcom.mif         | 21 +--------------------
 win32/wccwin32.mak |  9 ++++++---
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak
index 2220945d..25be604c 100644
--- a/dos/wccdos16.mak
+++ b/dos/wccdos16.mak
@@ -39,10 +39,13 @@ CCFLAGS		= /bt=$(TARGET) /zq /wx /m$(MODEL) $(CFLAGS) $(CPPFLAGS)
 
 LIBEXE		= wlib /q /n /t
 
-PLATFORM	= 16 bit DOS
-ARCNAME		= pdc$(VER)16w
-
 !include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ @$(osdir)\wccdos.lrf
+
+PLATFORM1	= Watcom C++ 16-bit DOS
+PLATFORM2	= Open Watcom 1.3 for 16-bit DOS
+ARCNAME		= pdc$(VER)16w
+
+!include $(PDCURSES_HOME)\makedist.mif
diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak
index 46cc5d38..b402355f 100644
--- a/dos/wccdos4g.mak
+++ b/dos/wccdos4g.mak
@@ -38,10 +38,13 @@ CCFLAGS		= /bt=$(TARGET) /zq /wx /mf $(CFLAGS) $(CPPFLAGS)
 
 LIBEXE		= wlib /q /n /t
 
-PLATFORM	= 32 bit DOS
-ARCNAME		= pdc$(VER)32w
-
 !include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ @$(osdir)\wccdos.lrf
+
+PLATFORM1	= Watcom C++ 32-bit DOS
+PLATFORM2	= Open Watcom 1.3 for 32-bit DOS
+ARCNAME		= pdc$(VER)32w
+
+!include $(PDCURSES_HOME)\makedist.mif
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index 076c8d5f..72f86b03 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -38,10 +38,13 @@ CCFLAGS 	= /bt=$(TARGET) /wx /s /zq $(CFLAGS) $(CPPFLAGS)
 
 LIBEXE		= wlib /q /n /b /c /t
 
-PLATFORM	= OS/2
-ARCNAME		= pdc$(VER)_wcc_os2
-
 !include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS)
+
+PLATFORM1	= Watcom C++ OS/2
+PLATFORM2	= Open Watcom 1.3 for OS/2
+ARCNAME		= pdc$(VER)_wcc_os2
+
+!include $(PDCURSES_HOME)\makedist.mif
diff --git a/watcom.mif b/watcom.mif
index 5f0f6e1e..23b9e89e 100644
--- a/watcom.mif
+++ b/watcom.mif
@@ -53,23 +53,4 @@ ptest.exe:	ptest.obj $(LIBCURSES) $(LIBPANEL)
 tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
 	$(LINK) $(LDFLAGS) n $@ f tuidemo.obj f tui.obj l $(LIBCURSES)
 
-dist: .symbolic $(PDCLIBS)
-	%write file_id.diz PDCurses $(VERDOT) for Watcom C++ $(PLATFORM)
-	%append file_id.diz ------------------------------------------
-	%append file_id.diz Public Domain Curses library for
-	%append file_id.diz Open Watcom 1.3 for $(PLATFORM).
-	%append file_id.diz Source available in PDCURS$(VER).ZIP
-	%append file_id.diz Public Domain.
-	%write flist $(PDCURSES_HOME)\README
-	%append flist $(PDCURSES_HOME)\HISTORY
-	%append flist $(PDCURSES_HOME)\maintain.er
-	%append flist $(PDCURSES_HOME)\curses.h
-	%append flist $(PDCURSES_HOME)\curspriv.h
-	%append flist $(PDCURSES_HOME)\panel.h
-	%append flist $(PDCURSES_HOME)\term.h
-	%append flist $(LIBCURSES)
-	%append flist $(LIBPANEL)
-	%append flist file_id.diz
-	zip -9jX $(ARCNAME) -@ <flist
-	del flist
-	del file_id.diz
+dist: .symbolic
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index 469715d1..47fe2c94 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -38,10 +38,13 @@ CCFLAGS		= /ei /zq /wx $(CFLAGS) $(CPPFLAGS)
 
 LIBEXE		= wlib /q /n /t
 
-PLATFORM	= Win32
-ARCNAME		= pdc$(VER)_wcc_w32
-
 !include $(PDCURSES_HOME)\watcom.mif
 
 $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
 	$(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS)
+
+PLATFORM1	= Watcom C++ Win32
+PLATFORM2	= Open Watcom 1.3 for Win32
+ARCNAME		= pdc$(VER)_wcc_w32
+
+!include $(PDCURSES_HOME)\makedist.mif