new CHROME_MISC rule. fix CHROME_TYPE rule

config/rules.mak

@@ -841,11 +841,35 @@ $(CHROME_L10N:.\=CLOBBER\.\):
 
 !endif # localization
 
-!ifdef CHROME_TYPE
-install:: $(CHROME_TYPE)
+# miscellaneous chrome
+!if "$(CHROME_MISC)" != "$(NULL)"
 
-$(CHROME_TYPE):
-    echo $@,0,$(MAKEDIR)\$(DIST)\bin\chrome\$(CHROME_DIR)\$(CHROME_TYPE) >>$(DIST)\bin\chrome\installed-chrome.txt
+CHROME_MISC=$(CHROME_MISC:/=\)
+
+# misc goes to CHROME_DIR unless specified otherwise.
+!if "$(CHROME_MISC_DIR)" == "$(NULL)"
+CHROME_MISC_DIR=.
+!endif
+
+# Export misc files by copying to dist.
+install:: $(CHROME_MISC:.\=INSTALL\.\)
+
+# Pseudo-target specifying how to install content files.
+$(CHROME_MISC:.\=INSTALL\.\):
+    $(MAKE_INSTALL) $(@:INSTALL\.=.) $(CHROME_DIST)\$(CHROME_MISC_DIR)
+
+# Clobber content files.
+clobber_all:: $(CHROME_MISC:.\=CLOBBER\.\)
+
+# Pseudo-target specifying how to clobber content files.
+$(CHROME_MISC:.\=CLOBBER\.\):
+    -@$(RM) $(CHROME_DIST)\$(CHROME_MISC_DIR)\$(@:CLOBBER\.=.)
+
+!endif # miscellaneous chrome
+
+!if "$(CHROME_TYPE)" != "$(NULL)"
+install::
+    -for %t in ($(CHROME_TYPE)) do echo %t,install,path,$(MAKEDIR)\$(DIST)\bin\chrome\$(CHROME_DIR) >>$(DIST)\bin\chrome\installed-chrome.txt
 !endif
 
 !endif # chrome

config/rules.mk

@@ -1161,7 +1161,7 @@ CHROME_DIST := $(DIST)/bin/chrome/$(CHROME_DIR)
 # Content
 ifneq ($(CHROME_CONTENT),)
 ifeq ($(CHROME_CONTENT_DIR),) # Use CHROME_DIR unless specified otherwise.
-CHROME_CONTENT_DIR := content
+CHROME_CONTENT_DIR := .
 endif
 install::
 	$(INSTALL) $(addprefix $(srcdir)/, $(CHROME_CONTENT)) $(CHROME_DIST)/$(CHROME_CONTENT_DIR)
@@ -1171,7 +1171,7 @@ endif
 # Skin
 ifneq ($(CHROME_SKIN),)
 ifeq ($(CHROME_SKIN_DIR),) # Use CHROME_DIR unless specified otherwise.
-CHROME_SKIN_DIR := skin
+CHROME_SKIN_DIR := .
 endif
 install::
 	$(INSTALL) $(addprefix $(srcdir)/, $(CHROME_SKIN)) $(CHROME_DIST)/$(CHROME_SKIN_DIR)
@@ -1181,18 +1181,28 @@ endif
 # Localization.
 ifneq ($(CHROME_L10N),)
 ifeq ($(CHROME_L10N_DIR),) # Use CHROME_DIR unless specified otherwise.
-CHROME_L10N_DIR := locale
+CHROME_L10N_DIR := .
 endif
 install::
 	$(INSTALL) $(addprefix $(srcdir)/, $(CHROME_L10N)) $(CHROME_DIST)/$(CHROME_L10N_DIR)
 endif
 # localization
 
+# misc
+ifneq ($(CHROME_MISC),)
+ifeq ($(CHROME_MISC_DIR),) # Use CHROME_DIR unless specified otherwise.
+CHROME_MISC_DIR := .
+endif
+install::
+	$(INSTALL) $(addprefix $(srcdir)/, $(CHROME_MISC)) $(CHROME_DIST)/$(CHROME_MISC_DIR)
+endif
+# misc
+
 ifneq ($(CHROME_TYPE),)
 install:: $(addprefix bogus/, $(CHROME_TYPE))
 
 $(addprefix bogus/, $(CHROME_TYPE)):
-	@echo $(patsubst bogus/%, %, $@),0,`pwd`/$(DEPTH)/dist/bin/chrome/$(CHROME_DIR)/$(CHROME_TYPE) >>$(DEPTH)/dist/bin/chrome/installed-chrome.txt
+	@echo $(patsubst bogus/%, %, $@),install,path,`pwd`/$(DEPTH)/dist/bin/chrome/$(CHROME_DIR) >>$(DEPTH)/dist/bin/chrome/installed-chrome.txt
 endif
 
 endif