Bug 295711 part 3 - Package inspector as a real extension (in <appdir>/extensions/inspector@mozilla.org/...) and consolidate all the silly app-specific forking/overriding done in browser/extensions/inspector and mail/extensions/inspector r=mconnor sr+a=shaver

layout/inspector/public/Makefile.in

@@ -47,6 +47,10 @@ include $(DEPTH)/config/autoconf.mk
 MODULE=inspector
 XPIDL_MODULE=inspector
 
+ifdef MOZ_XUL_APP
+XPI_NAME = inspector
+endif
+
 XPIDLSRCS = inIDOMView.idl \
             inIDeepTreeWalker.idl \
             inIFlasher.idl \

layout/inspector/src/Makefile.in

@@ -46,6 +46,10 @@ MODULE=inspector
 LIBRARY_NAME=inspector_s
 MOZILLA_INTERNAL_API = 1
 
+ifdef MOZ_XUL_APP
+XPI_NAME = inspector
+endif
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \