inject scm revision into built install.rdf

src/Makefile

@@ -53,8 +53,8 @@ sed '/log.debug(/d' $(2) > $(1);
 endif
 
 # The target location of the build and build files.
-git_rev = -$(shell git rev-parse --short HEAD)
-build_dir := ../build$(git_rev)$(build_debug)
+SCM-REVISION = $(shell git rev-parse --short HEAD)
+build_dir := ../build-$(SCM-REVISION)$(build_debug)
 
 
 # The location of the extension profile. (this extension is intended for Linux only)
@@ -155,6 +155,10 @@ $(build_dir)/%: %
 	@mkdir -p $(dir $@)
 	@cp -f $< $@ # -d for symlinks
 
+# Inject SCM revision stamp. This may be useful in case we mess up with tags
+$(build_dir)/$(install_rdf): $(install_rdf)
+	@sed 's/\/\* SCM-REVISION:/\/* SCM-REVISION: $(SCM-REVISION) /' $< > $@
+
 # Debug calls are removed for performance.
 # NOTE: we could also use m4 for filtering source files...
 $(build_dir)/$(chrome_source_root)/%.js: $(chrome_source_root)/%.js

src/install.rdf

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- /* SCM-REVISION: DO NOT REMOVE */ -->
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>{9533f794-00b4-4354-aa15-c2bbda6989f8}</em:id>