From 92bcf43b0557ea2a48b51b159d7968e65f9787a6 Mon Sep 17 00:00:00 2001 From: Smokey Ardisson Date: Fri, 8 Oct 2010 22:10:51 -0400 Subject: [PATCH] Bug 600133 - Fix about:buildconfig unification after bug 538890, and future-proof the process a little bit. r=gavin, a2.0=gavin --- build/macosx/universal/fix-buildconfig | 4 ++-- toolkit/content/buildconfig.html | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/macosx/universal/fix-buildconfig b/build/macosx/universal/fix-buildconfig index 16124d7087de..41851d24e562 100755 --- a/build/macosx/universal/fix-buildconfig +++ b/build/macosx/universal/fix-buildconfig @@ -126,9 +126,9 @@ sub fixBuildconfig($$$) { # Insert a
between the two files. push (@linesNew, '
'); - # Copy the second file's content beginning after its leading

and

. + # Copy the second file's content beginning after its leading

. while ($line = shift(@lines2)) { - if ($line eq '

') { + if ($line eq '

about:buildconfig

') { last; } } diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html index 750804499fe8..786454189057 100644 --- a/toolkit/content/buildconfig.html +++ b/toolkit/content/buildconfig.html @@ -20,8 +20,8 @@ # the Initial Developer. All Rights Reserved. # # Contributor(s): -# Seawood (original author) -# Christian Biesinger +# Christopher Seawood (original author) +# Christian Biesinger # Ehsan Akhgari # Ted Mielczarek # Steffen Wilberg @@ -39,7 +39,10 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** - +# +# IMPORTANT: Do not modify this file without checking the results of +# build/macosx/universal/fix-buildconfig in a Mac Universal binary. +# #filter substitution