From 65eec022ea7ad64d0481e57c69732457a076ebb7 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Tue, 7 Jan 2014 17:45:41 -0800
Subject: [PATCH] Build separate Zips for doom/doom2 and FreeDM

Consensus shows that the change in
2014-01-07T06:34:47Z!mikeonthecomputer@gmail.com was a bit too
extreme. Keep FreeDM as its own special thing, being much more focused
on multiplayer than the other IWADs, as well as being the
vanilla-compatible IWAD.
---
 Makefile         | 21 +++++++++++++--------
 scripts/makepkgs | 19 +++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 453d4285..4683d792 100644
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,11 @@ DEUTEX=deutex
 DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255
 DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
 
-OBJS= \
-	$(WADS)/doom2.wad             \
-	$(WADS)/doom.wad	      \
-	$(WADS)/freedm.wad
+FREEDOOM1=$(WADS)/doom.wad
+FREEDOOM2=$(WADS)/doom2.wad
+FREEDM=$(WADS)/freedm.wad
+
+OBJS=$(FREEDM) $(FREEDOOM1) $(FREEDOOM2)
 
 all: $(OBJS)
 
@@ -93,7 +94,7 @@ wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
 #---------------------------------------------------------
 # freedm iwad
 
-$(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
+$(FREEDM): wadinfo_freedm.txt subdirs force
 	@mkdir -p $(WADS)
 	ln -sf freedm/texture1.txt textures/texture1.txt
 	rm -f $@
@@ -102,7 +103,7 @@ $(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force
 #---------------------------------------------------------
 # doom2 iwad
 
-$(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
+$(FREEDOOM2): wadinfo_iwad.txt subdirs force
 	@mkdir -p $(WADS)
 	ln -sf doom2/texture1.txt textures/texture1.txt
 	rm -f $@
@@ -111,7 +112,7 @@ $(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force
 #---------------------------------------------------------
 # udoom iwad
 
-$(WADS)/doom.wad: wadinfo_ult.txt subdirs force
+$(FREEDOOM1): wadinfo_ult.txt subdirs force
 	@mkdir -p $(WADS)
 	ln -sf doom/texture1.txt textures/texture1.txt
 	rm -f $@
@@ -121,8 +122,12 @@ doc: BUILD-SYSTEM.asc README.asc
 	asciidoc BUILD-SYSTEM.asc
 	asciidoc README.asc
 
+DISTDOCS=COPYING CREDITS README.html
+
+# Due to convoluted reasons, the WADs must directly proceed the game name.
 dist: $(OBJS) doc
-	VERSION=$(VERSION) scripts/makepkgs $(OBJS)
+	VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
+	VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
 
 clean:
 	rm -f	*.html deutex.log $(OBJS) \
diff --git a/scripts/makepkgs b/scripts/makepkgs
index c2d6f9dc..d54c02f7 100755
--- a/scripts/makepkgs
+++ b/scripts/makepkgs
@@ -32,13 +32,8 @@ import sys
 
 # Documentation files included with distributions.
 
-DIST_DOCS = [
-    "COPYING",
-    "CREDITS",
-    "README.html"
-]
-
-DIR_NAME='freedoom'
+GAME_NAME=sys.argv[1]
+FILES=sys.argv[2:]
 
 # Run a command, displaying it before executing it.
 
@@ -57,17 +52,17 @@ if version[0] is 'v':
     # Strip the leading 'v' from versioning
     version = version[1:]
 
-path = os.path.dirname(sys.argv[1])
-basename = os.path.basename(sys.argv[1])
+path = os.path.dirname(FILES[0])
+basename = os.path.basename(FILES[0])
 
-base_dir = DIR_NAME + "-" + version
+base_dir = GAME_NAME + "-" + version
 full_path = path + "/" + base_dir
 
 # Create directory and add files
 
 run_command("mkdir %s" % full_path)
-for files in DIST_DOCS + sys.argv[1:]:
-    run_command("cp %s %s" % (files, full_path))
+for file in FILES:
+    run_command("cp %s %s" % (file, full_path))
 
 orig_dir = os.getcwd()