--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -102,17 +102,17 @@ endif
 
 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DTHUNDERBIRD_MAXVERSION=$(THUNDERBIRD_MAXVERSION) \
            -DAB_CD=$(AB_CD) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
            -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
-           -DXPI_EM_ID=$(XPI_EM_ID) \
+           -DXPI_EM_ID="$(XPI_EM_ID)" \
            -DTHEME=$(THEME) \
            $(NULL)
 
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 # xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
 libs::

--- a/mail/themes/Makefile.in
+++ b/mail/themes/Makefile.in
@@ -4,19 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-include $(topsrcdir)/config/rules.mk
-
-CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
-
-DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION)
+DIST_FILES = install.rdf
 
-libs::
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf -o $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf)
-
-install::
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf -o $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf)
+include $(topsrcdir)/config/rules.mk

--- a/mail/themes/moz.build
+++ b/mail/themes/moz.build
@@ -5,8 +5,12 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'qt'):
     DIRS += ['linux']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['osx']
 else:
     DIRS += ['windows']
 
+classic_extension_dir = '{972ce4c6-7e08-4474-a285-3208198ce6fd}'
+
+DEFINES['THUNDERBIRD_VERSION'] = CONFIG['THUNDERBIRD_VERSION']
+DIST_SUBDIR = 'extensions/' + classic_extension_dir