merge with 1.10c + local build mods

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 4543f1dee2f172057242803c72946df38f86d6ab..1d2c2f6b16b940b8b67c457a3464516334c46367 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -3,6 +3,12 @@ Sun Jun 19 00:18:06 1994  Jim Meyering  (meyering@comco.com)
        * nice.c (main): Accept options like `--5' (equivalent to `-n -5')
        instead of letting getopt give an `unrecognized option' error.
 
+       * long-options.c: Require another argument: version_string.
+       Don't include "version.h" or "system.h".
+       * basename.c, dirname.c, echo.c, expr.c, hostname.c, printf.c,
+       pwd.c, stty.c, test.c, yes.c: Adjust callers of parse_long_options
+       accordingly.
+
 Thu Jun 02 14:11:31 1994  Jim Meyering  (meyering@comco.com)
 
        * stty.c (main): Set max_col and current_col before running