From 1916969baaa5d2bd84f323ca0510ba2c8a04ef58 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 22 Apr 2018 19:15:20 -0400
Subject: Fix preprocessor conditional precedence in application.ini

---
 build/application.ini | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/application.ini b/build/application.ini
index c3ab3abdd..8f65421ed 100644
--- a/build/application.ini
+++ b/build/application.ini
@@ -18,14 +18,18 @@
 #include @TOPOBJDIR@/buildid.h
 #include @TOPOBJDIR@/source-repo.h
 [App]
-#if defined(MC_OFFICIAL) && defined(MC_PALEMOON) || defined(MC_BASILISK)
+#ifdef MC_OFFICIAL
+#if defined(MC_PALEMOON) || defined(MC_BASILISK)
 Vendor=Moonchild Productions
-#elif defined(MC_OFFICIAL) && defined(BINOC_BOREALIS)
+#elif defined(BINOC_BOREALIS)
 Vendor=Binary Outcast
 #else
 Vendor=@MOZ_APP_VENDOR@
 #endif
-#if defined(MC_OFFICIAL) && defined(MC_PALEMOON)
+#else
+Vendor=@MOZ_APP_VENDOR@
+#endif
+#ifdef MC_PALEMOON
 Name=Pale Moon
 #else
 Name=@MOZ_APP_BASENAME@
-- 
cgit v1.2.3