From c8cef25b72fe5fdffa5458a53132c199dfc6b692 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Wed, 17 Oct 2012 09:48:14 +0100 Subject: [PATCH] bug 801418 - use perl to avoid sed cmd-line errors generated by MOZ_POST_STAGING_COMMAND during 'make package' for mobile. r=mwu --- mobile/android/installer/Makefile.in | 2 +- mobile/xul/installer/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in index 710e6f39210d..d2d5bf5f86ff 100644 --- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -48,7 +48,7 @@ ifdef MOZ_PKG_MANIFEST_P MOZ_PKG_MANIFEST = package-manifest endif -MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec sed -i '/^\#/d' {} \; +MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec $(PERL) -n -i -e 'print unless /^\#/' {} \; include $(topsrcdir)/toolkit/mozapps/installer/packager.mk diff --git a/mobile/xul/installer/Makefile.in b/mobile/xul/installer/Makefile.in index d7360f8db553..6c98a1e9276c 100644 --- a/mobile/xul/installer/Makefile.in +++ b/mobile/xul/installer/Makefile.in @@ -48,7 +48,7 @@ ifdef MOZ_PKG_MANIFEST_P MOZ_PKG_MANIFEST = package-manifest endif -MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec sed -i '/^\#/d' {} \; +MOZ_POST_STAGING_CMD = find chrome -type f -name *.properties -exec $(PERL) -n -i -e 'print unless /^\#/' {} \; include $(topsrcdir)/toolkit/mozapps/installer/packager.mk