summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-22 19:15:20 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-22 19:15:20 -0400
commit1916969baaa5d2bd84f323ca0510ba2c8a04ef58 (patch)
tree42881b6a223f6142502f943568aabf4064fd1c44
parent3c48cc85098587c7f3a6cefe133a94468927d100 (diff)
downloadUXP-1916969baaa5d2bd84f323ca0510ba2c8a04ef58.tar
UXP-1916969baaa5d2bd84f323ca0510ba2c8a04ef58.tar.gz
UXP-1916969baaa5d2bd84f323ca0510ba2c8a04ef58.tar.lz
UXP-1916969baaa5d2bd84f323ca0510ba2c8a04ef58.tar.xz
UXP-1916969baaa5d2bd84f323ca0510ba2c8a04ef58.zip
Fix preprocessor conditional precedence in application.ini
-rw-r--r--build/application.ini10
1 files changed, 7 insertions, 3 deletions
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@