merge with 3.9i

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c3b28d1ed7c149ea7dadec807b756d1b821dab76..168222b94d696c2aa91e2c50011523f20ae9f5a7 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile for GNU shell utils documentation.
+# Makefile for GNU file utilities documentation.
 # Copyright (C) 1994 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ version.texi: $(srcdir)/../src/version.c
            -e 's/[^"]*"\([^"]*\)".*/@set VERSION \1/' \
            -e q $(srcdir)/../src/version.c \
          > $@-t
-       echo '@set RELEASE_DATE '`date '+%B %Y'` >> $@-t
+       echo '@set RELEASEDATE '`date '+%B %Y'` >> $@-t
        mv $@-t $@
 
 fileutils.info: fileutils.texi version.texi
@@ -49,7 +49,7 @@ fileutils.info: fileutils.texi version.texi
 
 dvi: fileutils.dvi
 
-fileutils.dvi: fileutils.texi
+fileutils.dvi: fileutils.texi version.texi
        $(TEXI2DVI) $(srcdir)/fileutils.texi
 
 installdirs:

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 59650d90ccad1d174b2cf96cde9c3685902f9efd..1a5ba2ddcf86d5240852ab4bc74ad94ac5d12e38 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -21,7 +21,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-
 #include <errno.h>
 #ifndef errno
 extern int errno;

diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 452d48d6a9d58b79a937a1744b52be9b2518ef46..bdd6c3bf7422850b4f8ebf54111b8fec0fcdc2c5 100644 (file)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,31 @@
+Fri Oct 07 20:27:48 1994  Jim Meyering  (meyering@comco.com)
+
+       * Makefile.in (install, uninstall): Prepend ginstall->install
+       mapping to standard $(transform) sed mapping.
+
+       * chgrp.c, chmod.c, chown.c, install.c, mkdir.c, mkfifo.c, mknod.c,
+       rm.c, rmdir.c (main): Diagnose wrong number of argument -- usually
+       too few -- instead of just referring the user to the --help option.
+       * mknod.c (main): Give diagnostics explaining specific problems
+       instead of just the usage message.  Reported by Karl Berry.
+
+       * configure.in: Overhaul tests that determine how to get filesystem
+       usage statistics.  Now, most use AC_TRY_RUN and test for the precise
+       feature that will be used.  I know that that will make configuring a
+       little harder for the people who cross compile, but if one of them
+       is annoyed enough (or complains loudly enough :-) maybe someone will
+       find the time to add tests to be used solely when cross compiling.
+       * acconfig.h (STAT_READ): Rename to STAT_READ_FILSYS.
+       * fsusage.c: Reorganize accordingly.
+
+Tue Oct 04 20:38:12 1994  Jim Meyering  (meyering@comco.com)
+
+       * chmod.c (main): Remove trailing slashes from file name arguments.
+       Otherwise, `chmod 600 foo/; chmod 700 foo/' failed with the error
+       `chmod: foo/: Permission denied' under Linux 1.1.51.  Reported by
+       Thomas Koenig (ig25@fg70.rz.uni-karlsruhe.de).
+       * chown.c (main): Likewise.
+
 Sat Oct 01 21:23:27 1994  Jim Meyering  (meyering@comco.com)
 
        * src/*.c: Remove CONFIG_BROKETS conditional.