Bug 957220, part 3: Fix shell metacharacter quoting issues, r=Standard8

calendar/lightning/Makefile.in

@@ -107,7 +107,7 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_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)
 

mail/themes/Makefile.in

@@ -9,14 +9,6 @@ VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
+DIST_FILES = install.rdf
+
 include $(topsrcdir)/config/rules.mk
-
-CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
-
-DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION)
-
-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)

mail/themes/moz.build

@@ -10,3 +10,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 else:
     DIRS += ['windows']
 
+classic_extension_dir = '{972ce4c6-7e08-4474-a285-3208198ce6fd}'
+
+DEFINES['THUNDERBIRD_VERSION'] = CONFIG['THUNDERBIRD_VERSION']
+DIST_SUBDIR = 'extensions/' + classic_extension_dir