merge with 1.9.4l + local build mods

3 files changed, 10 insertions, 1 deletions

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 95635579d..5fd167149 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,5 +1,12 @@
 Fri May 13 09:45:23 1994  Jim Meyering  (meyering@comco.com)
 
+	* pwd.c: Include <sys/types.h> before "system.h".
+	From Kaveh Ghazi.
+
+	* {lib,man,src}/Makefile.in (Makefile): Use ../config.status
+	instead of $(srcdir)/../config.status.  The latter didn't work
+	for builddir != srcdir.  From Kaveh Ghazi.
+
 	* Makefile.in (Makefile): Remove dependencies on */Makefile.in.
 	Change the rule so running config.status creates only Makefile.
 	(stamp-config): Have config.status generate only config.h.
@@ -10,6 +17,7 @@ Fri May 13 09:45:23 1994  Jim Meyering  (meyering@comco.com)
 	* hostname.c: New program.
 	* hostname.1: New file.
 	* Makefile.in (PROGS): Add hostname.
+	(SOURCES): Add hostname.c
 	* src/Makefile.in: Add rules and dependencies for hostname.
 	* configure.in (AC_HAVE_FUNCS): Add sethostname.
 
diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index d327940b2..7bd07a0e9 100644
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,5 +1,5 @@
 User visible changes in release 2.0
-* add pwd and users commands
+* add hostname, pwd, and users commands
 * --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.
diff --git a/src/pwd.c b/src/pwd.c
index 06fa29432..96c3bbfe4 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "system.h"
 #include "long-options.h"