From 364d7617d4d8402ec95828ad444606b2abba5050 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 24 Jul 2003 18:34:38 +0000 Subject: [PATCH] Fix firebird bustage more cleanly by moving xpinstall unconditionally into tier 50. r=cls b=212509 --- Makefile.in | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4e33db5a8cfb..3ea4b0376206 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,9 +43,6 @@ default: $(SUBMAKEFILES) $(MAKE) tier_2 $(MAKE) tier_9 $(MAKE) tier_50 -ifdef MOZ_XPINSTALL - $(MAKE) tier_90 -endif ifdef MOZ_JSDEBUGGER $(MAKE) tier_93 endif @@ -76,9 +73,6 @@ ifdef GC_LEAK_DETECTOR DIRS += gc/boehm endif -ifdef MOZ_XPINSTALL -DIRS += $(tier_90_dirs) -endif ifdef MOZ_JSDEBUGGER DIRS += $(tier_93_dirs) endif @@ -270,18 +264,15 @@ ifdef MOZ_PHOENIX tier_50_dirs += browser/components/bookmarks/public endif +# toolkit/xre/ depends on xpinstall, so it must be in tier 50 +ifdef MOZ_XPINSTALL +tier_50_dirs += xpinstall +endif + # # tier 9x - application features # -ifdef MOZ_XPINSTALL -ifdef MOZ_XUL_APP -tier_50_dirs += xpinstall -else -tier_90_dirs += xpinstall -endif -endif - ifdef MOZ_JSDEBUGGER tier_93_dirs += js/jsd endif