From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Tue, 27 Apr 1999 12:34:07 +0000 (+0000)
Subject: * automake.in (initialize_global_constants): Remove zip file
X-Git-Tag: merging-into-user-dep-gen~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa9d442cc4365bd0b9d031a214d9ad43281e3e82;p=thirdparty%2Fautomake.git

* automake.in (initialize_global_constants): Remove zip file
before re-creating it.
Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
---

diff --git a/ChangeLog b/ChangeLog
index 5b3605d88..018b6963a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-04-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* automake.in (initialize_global_constants): Remove zip file
+	before re-creating it.
+	Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
 	* texinfos.am (uninstall-info): Look for info file in srcdir, just 
 	like in install-info-am.
 	Reported by Tudor Hulubei <tudor@cs.unh.edu>
diff --git a/automake.in b/automake.in
index 1c3e0719f..39172d86e 100755
--- a/automake.in
+++ b/automake.in
@@ -6647,7 +6647,8 @@ sub initialize_global_constants
     $dist{'dist-shar'} = ("\t"
 		     . 'shar $(distdir) | gzip > $(distdir).shar.gz'
 		     . "\n");
-    $dist{'dist-zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n";
+    $dist{'dist-zip'} = ("\t" . '-rm -f $(distdir).zip' . "\n" .
+			 "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n");
     $dist{'dist'} = ("\t"
 		     .  '$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz'
 		     . "\n");