Fix #648: make xpi doesn't work (#649)

* Fix #648: make xpi doesn't work

* Supply arguments to sed in Makefile more compatibly

Having an explicit empty string argument to sed’s '-i' option prevents
subsequent tokens from being mis-interpreted on the BSD flavour of sed
where the argument to '-i' is non-optional.

BSD is flexible about whitespace between the option and its argument but
GNU allows none, so cater to the latter by using sed -i''.

More properly fixes #648

Author: stvnw

common/Makefile

@@ -93,7 +93,7 @@ xpi:
 
 	# Remove existing locale entries from the manifest file
 	for locale in $(SUPPORTED_LOCALES); do \
-		sed -i -e "/$$locale/d" $(XPI_PATH)/chrome.manifest; \
+		sed -i'' -e "/$$locale/d" $(XPI_PATH)/chrome.manifest; \
 	done
 
 	# Package up locale specific documentation files
@@ -116,21 +116,21 @@ xpi:
 	done
 
 	# Update locale paths in manifest file
-	sed -i -e 's# ./locale/# locale/#' $(XPI_PATH)/chrome.manifest
-	sed -i -e 's#../common/#common/#' $(XPI_PATH)/chrome.manifest
+	sed -i'' -e 's# ./locale/# locale/#' $(XPI_PATH)/chrome.manifest
+	sed -i'' -e 's#../common/#common/#' $(XPI_PATH)/chrome.manifest
 
 	@echo "Replacing UUID, VERSION, DATE and UPDATEURL tags"
 	for file in `grep -rl -e "###UUID###" -e "###VERSION###" -e "###DATE###" $(XPI_PATH)` $(UPD_RDF_PATH); do \
-		sed -i -e "s,###UUID###,$(UUID),g" $${file}; \
-		sed -i -e "s,###VERSION###,$(VERSION),g" $${file}; \
-		sed -i -e "s,###MINVERSION###,$(MIN_VERSION),g" $${file}; \
-		sed -i -e "s,###MAXVERSION###,$(MAX_VERSION),g" $${file}; \
-		sed -i -e "s,###DATE###,$(BUILD_DATE),g" $${file}; \
-		sed -i -e "s,###UPDATEXPI###,$(UPDATE_URL_XPI),g" $${file}; \
+		sed -i'' -e "s,###UUID###,$(UUID),g" $${file}; \
+		sed -i'' -e "s,###VERSION###,$(VERSION),g" $${file}; \
+		sed -i'' -e "s,###MINVERSION###,$(MIN_VERSION),g" $${file}; \
+		sed -i'' -e "s,###MAXVERSION###,$(MAX_VERSION),g" $${file}; \
+		sed -i'' -e "s,###DATE###,$(BUILD_DATE),g" $${file}; \
+		sed -i'' -e "s,###UPDATEXPI###,$(UPDATE_URL_XPI),g" $${file}; \
 		if [ -n "$(UPDATE_URL)" ]; then \
-		    sed -i -e "s,###UPDATEURL###,$(UPDATE_URL),g" $${file}; \
+		    sed -i'' -e "s,###UPDATEURL###,$(UPDATE_URL),g" $${file}; \
 		else \
-		    sed -i "/###UPDATEURL###/d" $${file}; \
+		    sed -i'' -e "/###UPDATEURL###/d" $${file}; \
 		fi; \
 	done