From 7bfeb7f94d06116def5e55d20002d17f1cd3a9eb Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@valvesoftware.com>
Date: Sat, 13 Oct 2018 00:27:52 -0700
Subject: [PATCH] fix namespace collision for multiple proton installs

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
---
 build/makefile_base.mak        | 2 +-
 compatibilitytool.vdf.template | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 975d13fc..5a3bbbd1 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -263,7 +263,7 @@ $(DIST_VERSION): | $(DST_DIR)
 	cp $(DIST_VERSION) $(DST_BASE)/
 
 $(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) $(MAKEFILE_DEP) | $(DST_DIR)
-	sed -r 's|//##DISPLAY_NAME##|"display_name" "'$(BUILD_NAME)'"|' $< > $@
+	sed -r 's|##BUILD_NAME##|$(BUILD_NAME)|' $< > $@
 
 $(DIST_GECKO_DIR):
 	mkdir -p $@
diff --git a/compatibilitytool.vdf.template b/compatibilitytool.vdf.template
index 3117360b..5ac60e8b 100644
--- a/compatibilitytool.vdf.template
+++ b/compatibilitytool.vdf.template
@@ -2,7 +2,7 @@
 {
   "compat_tools"
   {
-    "proton-localbuild" // Internal name of this tool
+    "##BUILD_NAME##" // Internal name of this tool
     {
       // Can register this tool with Steam in two ways:
       //
@@ -14,9 +14,7 @@
       "install_path" "."
 
       // For this template, we're going to substitute the display_name key in here, e.g.:
-      // "display_name" "Proton - local build 3/2"
-
-      //##DISPLAY_NAME##
+      "display_name" "##BUILD_NAME##"
 
       "from_oslist"  "windows"
       "to_oslist"    "linux"