From: Jim Meyering <jim@meyering.net>
Date: Mon, 30 May 1994 00:06:15 +0000 (+0000)
Subject: merge with 1.10a + local build mods
X-Git-Tag: textutils-1_12_1~688
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3360a98c20e186ca692b6f158d2dc61955cbd14;p=thirdparty%2Fcoreutils.git

merge with 1.10a + local build mods
---

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index d9378dc060..c0231ef8c7 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,21 @@
+Sun May 29 17:40:21 1994  Jim Meyering  (meyering@comco.com)
+
+	* long-options.c: Move from src/ to lib/.
+	* long-options.h: Ditto.
+	* src/Makefile.in: Remove references to long-options.[ch].
+	* lib/Makefile.in (SOURCES, OBJECTS): Add long-options.[co].
+
+Fri May 27 18:20:18 1994  Jim Meyering  (meyering@comco.com)
+
+	* stty.c [VFLUSH && !VFLUSHO]: Define VFLUSH0.
+	Ultrix's termios.h defines VFLUSH, but not VFLUSHO.
+	From Kjetil Torgrim Homme <kjetilho@ifi.uio.no>.
+
+Thu May 26 08:46:32 1994  Jim Meyering  (meyering@comco.com)
+
+	* configure.in [INSTALL]: Revert change of March 8.  autoconf
+	has fixed this.
+
 Thu May 19 01:10:20 1994  Jim Meyering  (meyering@comco.com)
 
 	* Version 1.10.