|
@@ -0,0 +1,32 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Dmitry Butskoy <dmitry@butskoy.name>
|
|
|
+# Date 1608991044 0
|
|
|
+# Parent 67d5bc077f464d338544ad6f27c6ddca858fb286
|
|
|
+Bug 1659298 - Get rid of distribution extensions in favor of application global - mozilla patch. r=frg
|
|
|
+
|
|
|
+diff --git a/config/rules.mk b/config/rules.mk
|
|
|
+--- a/config/rules.mk
|
|
|
++++ b/config/rules.mk
|
|
|
+@@ -887,19 +887,19 @@ endif
|
|
|
+
|
|
|
+ # See comment above about moving this out of the tools tier.
|
|
|
+ ifdef INSTALL_EXTENSION_ID
|
|
|
+ ifndef XPI_NAME
|
|
|
+ $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
|
|
|
+ endif
|
|
|
+
|
|
|
+ tools::
|
|
|
+- $(RM) -r '$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
|
|
|
+- $(NSINSTALL) -D '$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
|
|
|
+- $(call copy_dir,$(FINAL_TARGET),$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
|
|
|
++ $(RM) -r '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
|
|
|
++ $(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
|
|
|
++ $(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
|
|
|
+
|
|
|
+ endif
|
|
|
+
|
|
|
+ #############################################################################
|
|
|
+ # MDDEPDIR is the subdirectory where all the dependency files are placed.
|
|
|
+ # This uses a make rule (instead of a macro) to support parallel
|
|
|
+ # builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two
|
|
|
+ # processes could simultaneously try to create the same directory.
|