remove MANS from dist

diff --git a/ChangeLog b/ChangeLog
index 3053dd8e3b24987f1acd793b36e7b35fdbd150d3..0d467cc82a1f8a9cbb86a982e9b40f7cebe5a404 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 Sat Feb 22 15:22:31 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * dist-vars.am (DISTFILES): Don't distribute MANS.
+
+       * automake.in (handle_dist): Use define_variable to define TAR,
+       GZIP.
+       (handle_dist): Pass GZIP in environment to tar.
+       (initialize_global_constants): Likewise.
+
+       From Kaveh Ghazi:
        * m4/protos.m4: Don't put any dependencies on AC_C_INLINE or
        AC_C_CONST.
-
        * m4/ccstdc.m4: Force AM_PROG_CC_STDC to come before AC_C_INLINE
        or AC_C_CONST.
 

diff --git a/NEWS b/NEWS
index f102b5e236f54cf2a03e2142389650bca24c2073..982d8768f599953ac93e6699a0e1b9e505292759 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.1l:
+New in 1.1m:
 * Bug fixes
 * Better DejaGNU support
 * Added no-installinfo option
@@ -13,7 +13,7 @@ New in 1.1l:
 * Will interpolate $(...) and ${...} when examining contents of a variable
 * .deps files now in build directory, not source directory; dependency
   handling generally rewritten
-* DATA and BUILT_SOURCES no longer included in distribution
+* DATA, MANS and BUILT_SOURCES no longer included in distribution
 * can now put config.h into a subdir
 * Added dist-all target
 * Support for install-info program (see texinfo 3.9)

diff --git a/automake.in b/automake.in
index af5e3137d626b06bb9e223d3bd7053a45b27730a..c9c7b7554f07a637f3e57ac7d57ac0b9a439e729 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2042,7 +2042,9 @@ sub handle_dist
     $output_vars .= "\n";
 
     # Some boilerplate.
-    $output_vars .= &file_contents ('dist-vars') . "\nTAR = " . $TAR . "\n";
+    $output_vars .= &file_contents ('dist-vars') . "\n";
+    &define_variable ('TAR', $TAR);
+    &define_variable ('GZIP', '--best');
 
     # Put these things in rules section so it is easier for whoever
     # reads Makefile.in.
@@ -2073,7 +2075,7 @@ sub handle_dist
 # tarfile.
 distcheck: dist
        rm -rf $(distdir)
-       $(TAR) zxf $(distdir).tar.gz
+       GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
@@ -4150,7 +4152,7 @@ sub initialize_global_constants
                     . 'shar $(distdir) | gzip > $(distdir).shar.gz'
                     . "\n");
     $dist{'zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n";
-    $dist{'dist'} = "\t" .  '$(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n";
+    $dist{'dist'} = "\t" .  'GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n";
     $dist_trailer = "\t" . 'rm -rf $(distdir)' . "\n";
 }
 

diff --git a/dist-vars.am b/dist-vars.am
index 5d3087573715fd26ec922c139b88a817ef05beb9..4b1c2ecb73d866b5a6c513ecc7799ca01b36cdd7 100644 (file)
--- a/dist-vars.am
+++ b/dist-vars.am
@@ -19,5 +19,4 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 ## DIST_COMMON comes first so that README can be the very first file.
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
-       $(TEXINFOS) $(MANS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)