From 7feddc9ea6aaee1b5be6c07b16747a1952b6a504 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 2 Jun 2008 21:17:49 +0000
Subject: [PATCH] fixed make xpi on mac, but require perl now (should be
 default on UNIX anyway)

---
 Makefile.common | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 408f7290..4020bf20 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -47,6 +47,7 @@ BUILD_XPI_SUBDIRS = $(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%})
 ASCIIDOC = asciidoc
 ZIP = zip
 SED = sed
+PERL = perl
 
 # specify V=1 on make line to see more verbose output
 Q=$(if ${V},,@)
@@ -119,8 +120,11 @@ ${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES}
 		( echo "modified: $$f" ; \
 		  diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \
 	    done
-	# FIXME: VERSION and DATE tokens not replaced
-	${Q}${SED} -e 's,\(skin\|content\|locale/.*\)/$$,jar:chrome/${NAME}.jar!/\1/,' \
+
+	@# sed -e -> does not work correctly on MacOS's sed, therefore we use perl
+	@# ${Q}${SED} -e 's,\(skin\|content\|locale/.*\)/$$,jar:chrome/${NAME}.jar!/\1/,' \
+
+	${Q}${PERL} -pe 's,(skin|content|locale/.*)/$$,jar:chrome/${NAME}.jar!/\1/,' \
 	           < chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest
 	${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} )
 	@echo "SUCCESS: $@"