From 07ffa554fe2e800a2eec5e785313c22d2c500ffd Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Mon, 10 Sep 2001 09:07:29 +0000 Subject: [PATCH] po/ChangeLog hack, for gettext bug git-svn-id: svn://10.0.0.236/trunk@102639 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/tinderbox/build-galeon.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mozilla/tools/tinderbox/build-galeon.pl b/mozilla/tools/tinderbox/build-galeon.pl index a0e4060adb2..31e8adb13a8 100644 --- a/mozilla/tools/tinderbox/build-galeon.pl +++ b/mozilla/tools/tinderbox/build-galeon.pl @@ -25,9 +25,11 @@ sub checkout { # chdir to build directory chdir "$mozilla_build_dir"; + # Hack to get around po/ChangeLog cvs conflict bug in gettext lib. + my $status = TinderUtils::run_shell_command("\\rm -f galeon/po/ChangeLog"); + # checkout galeon source $ENV{CVSROOT} = ":pserver:anonymous\@anoncvs.gnome.org:/cvs/gnome"; - my $status = TinderUtils::run_shell_command("$Settings::CVS checkout galeon"); # hack in the galeon prefs, if needed