From e3b5557a0dd286a7954948517ea4ab2e83bb6d0f Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Wed, 22 Apr 2020 01:28:15 -0700
Subject: [PATCH] More prefab tidying

---
 Makefile               | 12 ++++++------
 tools/batools/build.py |  6 +-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 59277b3a..14d90af1 100644
--- a/Makefile
+++ b/Makefile
@@ -123,27 +123,27 @@ prefab-release: prefab-release-build
 
 # Assemble a debug build for this platform.
 prefab-debug-build:
-	@tools/snippets make_prefab debug-build
+	@tools/snippets make_prefab debug
 
 # Assemble a release build for this platform.
 prefab-release-build:
-	@tools/snippets make_prefab release-build
+	@tools/snippets make_prefab release
 
 # Assemble/run a server debug build for this platform.
 prefab-server-debug: prefab-server-debug-build
 	${${shell tools/snippets prefab_run_var server-debug}}
 
 # Assemble/run a server release build for this platform.
-prefab-server-release:
-	@tools/snippets make_prefab server-release
+prefab-server-release: prefab-server-release-build
+	${${shell tools/snippets prefab_run_var server-release}}
 
 # Assemble a server debug build for this platform.
 prefab-server-debug-build:
-	@tools/snippets make_prefab server-debug-build
+	@tools/snippets make_prefab server-debug
 
 # Assemble a server release build for this platform.
 prefab-server-release-build:
-	@tools/snippets make_prefab server-release-build
+	@tools/snippets make_prefab server-release
 
 # Specific platform prefab targets:
 
diff --git a/tools/batools/build.py b/tools/batools/build.py
index e7626cb6..2ea701e1 100644
--- a/tools/batools/build.py
+++ b/tools/batools/build.py
@@ -84,13 +84,9 @@ class SourceCategory(Enum):
 class PrefabTarget(Enum):
     """Types of prefab builds able to be run."""
     DEBUG = 'debug'
-    DEBUG_BUILD = 'debug-build'
     SERVER_DEBUG = 'server-debug'
-    SERVER_DEBUG_BUILD = 'server-debug-build'
     RELEASE = 'release'
-    RELEASE_BUILD = 'release-build'
     SERVER_RELEASE = 'server-release'
-    SERVER_RELEASE_BUILD = 'server-release-build'
 
 
 def _checkpaths(inpaths: List[str], category: SourceCategory,
@@ -463,7 +459,7 @@ def make_prefab(target: PrefabTarget) -> None:
     """Make a prefab build for the current platform."""
     from efrotools import run
     platform = get_current_prefab_platform()
-    run(f'make prefab-{platform}-{target.value}')
+    run(f'make prefab-{platform}-{target.value}-build')
 
 
 def _vstr(nums: Sequence[int]) -> str: