From 0ff119d97322068085c31e44b5d0d09e0dc22dd8 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 27 Sep 2000 00:38:38 +0000 Subject: [PATCH] Make build ids work on unix again. Bug #53559 r=jag a=jar git-svn-id: svn://10.0.0.236/trunk@79987 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/make-jars.pl | 4 +++- mozilla/xpfe/browser/resources/locale/en-US/Makefile.in | 5 +++-- mozilla/xpfe/browser/resources/locale/en-US/unix-jar.mn | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 mozilla/xpfe/browser/resources/locale/en-US/unix-jar.mn diff --git a/mozilla/config/make-jars.pl b/mozilla/config/make-jars.pl index 652f6dbe678..8fc7c2bbf9e 100644 --- a/mozilla/config/make-jars.pl +++ b/mozilla/config/make-jars.pl @@ -124,7 +124,9 @@ sub EnsureFileInDir my $src = $srcFile; if (defined($src)) { - $src = "$srcPath/$srcFile"; + if (! -e $src ) { + $src = "$srcPath/$srcFile"; + } } else { $src = "$srcPath/$destFile"; diff --git a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in index d08591f03cb..42cd242b750 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in @@ -28,13 +28,14 @@ include $(DEPTH)/config/autoconf.mk DIRS = unix -GARBAGE += navigator.dtd.out +GARBAGE += navigator.dtd.out navigator.dtd.out: navigator.dtd $(DEPTH)/config/build_number Makefile Makefile.in cp $(srcdir)/navigator.dtd $@ $(PERL) $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number -chrome:: navigator.dtd.out +chrome:: navigator.dtd.out unix-jar.mn include $(topsrcdir)/config/rules.mk +JAR_MANIFEST = $(srcdir)/unix-jar.mn diff --git a/mozilla/xpfe/browser/resources/locale/en-US/unix-jar.mn b/mozilla/xpfe/browser/resources/locale/en-US/unix-jar.mn new file mode 100644 index 00000000000..bbd71d6ed2a --- /dev/null +++ b/mozilla/xpfe/browser/resources/locale/en-US/unix-jar.mn @@ -0,0 +1,2 @@ +en-US.jar: ++ locale/en-US/navigator/navigator.dtd (navigator.dtd.out)