From 54562053810b9fcbb225b662c2e26cade9a2fa52 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Tue, 26 Sep 2000 02:21:41 +0000 Subject: [PATCH] Fixed REGCHROME to work when MOZ_DISABLE_JAR_PACKAGING is defined. r=waterson git-svn-id: svn://10.0.0.236/trunk@79953 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/rules.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak index 8e3ae4c7d6a..5561fe6c836 100644 --- a/mozilla/config/rules.mak +++ b/mozilla/config/rules.mak @@ -591,8 +591,6 @@ chrome:: install:: chrome -!ifndef MOZ_OLD_JAR_PACKAGING - !ifdef MOZ_DISABLE_JAR_PACKAGING _JAR_FLAT_FILES_ONLY=-f _JAR_REGCHROME_JAR=1 @@ -601,6 +599,10 @@ _JAR_FLAT_FILES_ONLY= _JAR_REGCHROME_JAR=0 !endif +REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt $(_JAR_REGCHROME_JAR) + +!ifndef MOZ_OLD_JAR_PACKAGING + !if exist($(JAR_MANIFEST)) chrome:: @@ -608,8 +610,6 @@ chrome:: !endif -REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt $(_JAR_REGCHROME_JAR) - regchrome: !else # !MOZ_OLD_JAR_PACKAGING