From: Jim Meyering <jim@meyering.net>
Date: Wed, 22 Jun 1994 14:40:59 +0000 (+0000)
Subject: merge with 1.10c + local build mods
X-Git-Tag: textutils-1_12_1~679
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b1785ed05ee73585fbb8d421ef37a40ef9c709b;p=thirdparty%2Fcoreutils.git

merge with 1.10c + local build mods
---

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 4543f1dee2..1d2c2f6b16 100644
--- 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