From 5ae83e147c375f11b1f46258f0cbd316c822e4e0 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 5 May 2004 00:09:08 +0000 Subject: [PATCH] Remove extra ifs, as followup to bug 241003. r=mscott --- allmakefiles.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/allmakefiles.sh b/allmakefiles.sh index 899847a1802..a8a8b438d05 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -845,17 +845,14 @@ extensions/typeaheadfind/src/Makefile extensions/typeaheadfind/Makefile " -if [ "$MOZ_USE_OFFICIAL_BRANDING" ]; then - if [ "$MOZ_PHOENIX" ]; then - MAKEFILES_firefox_branding=" - other-licenses/branding/firefox/Makefile - other-licenses/branding/firefox/content/Makefile - " - fi - if [ "$MOZ_THUNDERBIRD" ]; then - MAKEFILES_thunderbird_branding="other-licenses/branding/thunderbird/Makefile" - fi -fi +MAKEFILES_firefox_branding=" +other-licenses/branding/firefox/Makefile +other-licenses/branding/firefox/content/Makefile +" + +MAKEFILES_thunderbird_branding=" +other-licenses/branding/thunderbird/Makefile +" MAKEFILES_phoenix=" browser/Makefile