merge with 1.9.4i

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index e24fe0d..be404b6 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,14 @@
+Thu Apr 28 00:45:02 1994  Jim Meyering  (meyering@comco.com)
+
+       * pwd.c: New program.
+       * pwd.1: New file.
+       * Makefile.in (PROGS): Add pwd.
+       * lib/Makefile.in: (DISTFILES): Add pathmax.h.
+       (SOURCES, OBJECTS): Add xgetcwd.c and xgetcwd.o respectively.
+       * src/Makefile.in: Add rules and dependencies for pwd.
+
+       * yes.c: Don't include version.h.
+
 Mon Apr 18 19:54:24 1994  Jim Meyering  (meyering@comco.com)
 
        * documentation: Change uses of `pathname' and `path' as per

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index fb0cb7d..3c470fb 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,4 +1,5 @@
 User visible changes in release 2.0
+* add pwd command
 * --version outputs the name of the utility as well as the package name
   and version number.
 * Configure properly determines options for stty on SCO ODT 3.0 systems.