From 1a18f1478e159610a4e7907d98f100acb03740bb Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Tue, 27 Dec 2005 22:12:26 +0000
Subject: [PATCH] New method for "dist" targets -- no more temporary directory,
 just a file list for zip. (On the down side, this makes the command line that
 much more InfoZip-specific.)

---
 dos/bccdos.mak     | 19 ++++++++-----------
 dos/gccdos.mak     | 31 +++++++++++--------------------
 dos/mscdos.mak     | 19 ++++++++-----------
 dos/msvcdos.mak    | 19 ++++++++-----------
 dos/wccdos16.mak   | 19 ++++++++-----------
 dos/wccdos4g.mak   | 19 ++++++++-----------
 os2/bccos2.mak     | 19 ++++++++-----------
 os2/gccos2.mak     | 27 +++++++++++++--------------
 os2/iccos2.mak     | 19 ++++++++-----------
 os2/owos2.mak      | 19 ++++++++-----------
 os2/wccos2.mak     | 19 ++++++++-----------
 win32/bccwin32.mak | 19 ++++++++-----------
 win32/gccwin32.mak | 22 +++++++++++-----------
 win32/vcwin32.mak  | 23 ++++++++++-------------
 win32/wccwin32.mak | 19 ++++++++-----------
 15 files changed, 133 insertions(+), 179 deletions(-)

diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index dfee6400..94eee209 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -321,15 +321,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ 3.1 PDC$(VER)BCC.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -337,5 +328,11 @@ dist: pdcurses.lib panel.lib
 	echo  Borland C/C++ 3.1. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)bcc *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)bcc -@ <flist
+	del flist
+	del file_id.diz
diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 5df29e47..4daaeaa7 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -20,11 +20,6 @@ PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 VER=27
 VERDOT=2.7
 
-# PDC_HOME is the backslashed version of PDCURSES_HOME, generated 
-# automatically
-
-PDC_HOME	= $(subst /,\,$(PDCURSES_HOME))
-
 PDCURSES_CURSES_H	=$(PDCURSES_HOME)/curses.h
 PDCURSES_CURSPRIV_H	=$(PDCURSES_HOME)/curspriv.h
 PDCURSES_HEADERS	=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
@@ -347,19 +342,6 @@ xmas.o: $(demodir)/xmas.c $(PDCURSES_CURSES_H)
 #------------------------------------------------------------------------
 
 dist: $(PDCLIBS)
-	-mkdir tmp
-	cd tmp
-	copy $(PDC_HOME)\README README
-	copy $(PDC_HOME)\readme.?? .
-	copy $(PDC_HOME)\curses.h .
-	copy $(PDC_HOME)\curspriv.h .
-	copy $(PDC_HOME)\maintain.er .
-	copy $(PDC_HOME)\INSTALL INSTALL
-	copy $(PDC_HOME)\TODO TODO
-	copy $(PDC_HOME)\panel.h panel.h
-	copy $(PDC_HOME)\pdc64.gif pdc64.gif
-	copy ..\$(LIBCURSES) .
-	copy ..\$(LIBPANEL) .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for DJGPP 2.0 PDC$(VER)DJG.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -367,5 +349,14 @@ dist: $(PDCLIBS)
 	echo  DJGPP 2.0. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)djg *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo $(PDCURSES_HOME)\INSTALL >> flist
+	echo $(PDCURSES_HOME)\TODO >> flist
+	echo $(PDCURSES_HOME)\pdc64.gif >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -j pdc$(VER)djg -@ <flist
+	del flist
+	del file_id.diz
diff --git a/dos/mscdos.mak b/dos/mscdos.mak
index af8aa197..46344372 100644
--- a/dos/mscdos.mak
+++ b/dos/mscdos.mak
@@ -328,15 +328,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Microsoft C++ 6.0 PDC$(VER)MSC.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -344,5 +335,11 @@ dist: pdcurses.lib panel.lib
 	echo  Microsoft C/C++ 6.0. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)msc *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)msc -@ <flist
+	del flist
+	del file_id.diz
diff --git a/dos/msvcdos.mak b/dos/msvcdos.mak
index 8af95107..db2a3d25 100644
--- a/dos/msvcdos.mak
+++ b/dos/msvcdos.mak
@@ -328,15 +328,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Microsoft Visual C++ 1.0 PDC$(VER)VCD.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -344,5 +335,11 @@ dist: pdcurses.lib panel.lib
 	echo  Microsoft Visual C/C++ 1.0 for DOS. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)vcd *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)vcd -@ <flist
+	del flist
+	del file_id.diz
diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak
index c7b53f63..c14ee32c 100644
--- a/dos/wccdos16.mak
+++ b/dos/wccdos16.mak
@@ -372,15 +372,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ 16bit DOS   PDC$(VER)16W.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -388,5 +379,11 @@ dist: pdcurses.lib panel.lib
 	echo  Watcom C/C++ 10.6 for 16 bit DOS. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)16w *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)16w -@ <flist
+	del flist
+	del file_id.diz
diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak
index 6b816e3c..508c2bd3 100644
--- a/dos/wccdos4g.mak
+++ b/dos/wccdos4g.mak
@@ -371,15 +371,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Watcom C++ 32bit DOS PDC$(VER)32W.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -387,5 +378,11 @@ dist: pdcurses.lib panel.lib
 	echo  Watcom C/C++ 10.6 for 32 bit DOS. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)32w *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)32w -@ <flist
+	del flist
+	del file_id.diz
diff --git a/os2/bccos2.mak b/os2/bccos2.mak
index 9fc02a15..272a2493 100644
--- a/os2/bccos2.mak
+++ b/os2/bccos2.mak
@@ -319,15 +319,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ OS/2 1.0 PDC$(VER)BCOS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -335,5 +326,11 @@ dist: pdcurses.lib panel.lib
 	echo  Borland C/C++ os/2 1.0. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)bcos2 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)bcos2 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index d7325a97..37ec31ff 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -569,19 +569,6 @@ xmas.o: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
 dist: $(DISTTARGETS)
-	-mkdir tmp
-	copy $(PDCURSES_HOME)\README tmp\README
-	copy $(PDCURSES_HOME)\readme.?? tmp
-	copy $(PDCURSES_HOME)\curses.h tmp
-	copy $(PDCURSES_HOME)\curspriv.h tmp
-	copy $(PDCURSES_HOME)\maintain.er tmp
-	-copy curses.dll tmp
-	-copy curses.lib tmp
-	-copy curses.a tmp
-	copy pdcurses.a tmp
-	copy pdcurses.lib tmp
-	copy panel.a tmp
-	copy panel.lib tmp
 	echo      PDCurses - Public Domain Curses > tmp\file_id.diz
 	echo  Version $(VERDOT)   for EMX OS/2   PDC$(VER)_EMX_OS2.ZIP >> tmp\file_id.diz
 	echo  ------------------------------------------ >> tmp\file_id.diz
@@ -589,4 +576,16 @@ dist: $(DISTTARGETS)
 	echo  EMX 0.9c for OS/2. >> tmp\file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> tmp\file_id.diz
 	echo  Public Domain. >> tmp\file_id.diz
-	rexx 'cd tmp'; 'zip pdc$(VER)_emx_os2 "*.*"'; return 0
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo curses.dll >> flist
+	echo curses.lib >> flist
+	echo curses.a >> flist
+	echo pdcurses.a >> flist
+	echo pdcurses.lib >> flist
+	echo panel.a >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_emx_os2 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/os2/iccos2.mak b/os2/iccos2.mak
index f1d0d5f5..9d160647 100644
--- a/os2/iccos2.mak
+++ b/os2/iccos2.mak
@@ -322,15 +322,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	chdir tmp
-	copy $(PDCURSES_HOME)\README  README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for C Set/2 OS/2   PDC$(VER)_ICC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -338,5 +329,11 @@ dist: pdcurses.lib panel.lib
 	echo  C Set/2 for OS/2. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_icc_os2 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_icc_os2 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/os2/owos2.mak b/os2/owos2.mak
index 34892f28..53839d20 100644
--- a/os2/owos2.mak
+++ b/os2/owos2.mak
@@ -365,15 +365,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ OS/2   PDC$(VER)_WCC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -381,5 +372,11 @@ dist: pdcurses.lib panel.lib
 	echo  Watcom C/C++ 10.6 for OS/2. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_wcc_os2 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_wcc_os2 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index 4ed87f33..97c9157d 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -365,15 +365,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ OS/2   PDC$(VER)_WCC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -381,5 +372,11 @@ dist: pdcurses.lib panel.lib
 	echo  Watcom C/C++ 10.6 for OS/2. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_wcc_os2 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_wcc_os2 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index cfdf9b7b..8b350652 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -322,15 +322,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ Win32 PDC$(VER)_BCC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -338,5 +329,11 @@ dist: pdcurses.lib panel.lib
 	echo  Borland C/C++ 4.0+ for Win32. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_bcc_w32 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_bcc_w32 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index 46ce0fd4..edca6992 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -328,15 +328,6 @@ xmas.o: $(demodir)/xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)/xmas.c
 
 dist: $(LIBCURSES) $(LIBPANEL)
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README .
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\$(LIBCURSES) .
-	copy ..\$(LIBPANEL) .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Cygnus Win32 PDC$(VER)_CYG_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -344,5 +335,14 @@ dist: $(LIBCURSES) $(LIBPANEL)
 	echo  Cygnus GCC for Win32. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_cyg_w32 *.*
-	cd ..
+	echo $(PDCURSES_HOME)/README > flist
+	echo $(PDCURSES_HOME)/readme.27 > flist
+	echo $(PDCURSES_HOME)/curses.h >> flist
+	echo $(PDCURSES_HOME)/curspriv.h >> flist
+	echo $(PDCURSES_HOME)/panel.h >> flist
+	echo $(PDCURSES_HOME)/term.h >> flist
+	echo $(PDCURSES_HOME)/maintain.er >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -j pdc$(VER)_cyg_w32 -@ <flist
+	rm flist file_id.diz
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index d2342f9f..cbf01c0f 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -603,17 +603,6 @@ test.dll.obj: test.c $(PDCURSES_CURSES_H)
 	$(CC) $(DLL_CCFLAGS) -Fo$@ test.c
 
 dist: curses.dll pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README .
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\curses.dll .
-	copy ..\curses.lib .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for VC++        PDC$(VER)_VC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -621,5 +610,13 @@ dist: curses.dll pdcurses.lib panel.lib
 	echo  Microsoft Visual C/C++ for Win32. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_vc_w32 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo curses.dll >> flist
+	echo curses.lib >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_vc_w32 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index 7c43d071..b10f2072 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -363,15 +363,6 @@ xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
 dist: pdcurses.lib panel.lib
-	-mkdir tmp
-	cd tmp
-	copy $(PDCURSES_HOME)\README README
-	copy $(PDCURSES_HOME)\readme.?? .
-	copy $(PDCURSES_HOME)\curses.h .
-	copy $(PDCURSES_HOME)\curspriv.h .
-	copy $(PDCURSES_HOME)\maintain.er .
-	copy ..\pdcurses.lib .
-	copy ..\panel.lib .
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Watcom C++ Win32 PDC$(VER)_WCC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -379,5 +370,11 @@ dist: pdcurses.lib panel.lib
 	echo  Watcom C/C++ 10.6 for Win32. >> file_id.diz
 	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
 	echo  Public Domain. >> file_id.diz
-	zip pdc$(VER)_wcc_w32 *.*
-	cd ..
+	echo $(PDCURSES_HOME)\README* > flist
+	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo pdcurses.lib >> flist
+	echo panel.lib >> flist
+	zip -j pdc$(VER)_wcc_w32 -@ <flist
+	del flist
+	del file_id.diz