Bug 626970 - SeaMonkey Windows builds have been burning since switching to omnijar; (Av1) Don't try to remove the current directory.
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 19 Jan 2011 13:59:25 +0100
changeset 6980 e9f62190bdf069a792b236d8e31bc2670fcfd918
parent 6979 44423b415a5f64847d4230f33ce3c01ef33b954e
child 6981 73c0c88c59135386828001951495893c8424bfa3
push idunknown
push userunknown
push dateunknown
bugs626970
Bug 626970 - SeaMonkey Windows builds have been burning since switching to omnijar; (Av1) Don't try to remove the current directory. r=kairo.
suite/app/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -295,17 +295,17 @@ endif
 libs:: blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
 ifdef MOZ_OMNIJAR
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 # Listed extension GUIDs:
-# 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla, f13b157f-... venkman
+# 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla, f13b157f-... Venkman
 EXTENSIONS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
   modern@themes.mozilla.org \
   debugQA@mozilla.org \
   {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} \
   {f13b157f-b174-47e7-a34d-4815ddfdfeb8} \
   inspector@mozilla.org \
   $(NULL)
@@ -318,17 +318,17 @@ EXTENSIONS += \
 endif
 
 ABS_DIST = $(call core_abspath,$(STAGEDIST))
 
 define _PACKAGE_EXTENSIONS
 @echo "Packaging $(dir).xpi..."
 if test -d "$(ABS_DIST)/extensions/$(dir)"; then \
 cd $(ABS_DIST)/extensions/$(dir)/; $(ZIP) -r9mX ../$(dir).xpi *; \
-rm -rf $(ABS_DIST)/extensions/$(dir); \
+cd ..; rm -rf $(ABS_DIST)/extensions/$(dir); \
 fi
 
 endef # do not remove the blank line!
 
 pack-ext: $(STAGEDIST)
 	@echo "Packaging extensions..."
 	$(foreach dir,$(EXTENSIONS),$(_PACKAGE_EXTENSIONS))