From 2a723c9db26f33f8e0639631b5a98e1f6a4a87db Mon Sep 17 00:00:00 2001
From: asac <asac@hector.personalfree.com>
Date: Mon, 12 Mar 2007 17:03:02 +0100
Subject: [PATCH] bz345077-make-install-installs-extensions-in-chrome-and-extensions

  * https://bugzilla.mozilla.org/show_bug.cgi?id=345077
  * https://bugzilla.mozilla.org/attachment.cgi?id=229687
---
 config/rules.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 197468f..88af4d7 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1569,6 +1569,7 @@ endif
 
 install:: $(CHROME_DEPS)
 ifndef NO_INSTALL
+ifndef XPI_NAME
 	@$(EXIT_ON_ERROR) \
 	if test -f $(JAR_MANIFEST); then \
 	  if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \
@@ -1582,6 +1583,7 @@ ifndef NO_INSTALL
 	    $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
 	fi
 endif
+endif
 
 ifneq ($(DIST_FILES),)
 libs:: $(DIST_FILES)
-- 
1.4.4.4