entered into RCS

9 files changed, 31 insertions, 16 deletions

diff --git a/Makeconfig b/Makeconfig
index 5b3fdb1e04..729390a27f 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -143,7 +143,7 @@ endif
 # Where to install machine-independent data files.
 # These are the timezone database, and eventually the locale database.
 ifndef datadir
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
 endif
 
 # Where to install the timezone data files (which are machine-independent).
@@ -156,6 +156,11 @@ ifndef bindir
 bindir = $(exec_prefix)/bin
 endif
 
+# Where to install administrative programs.
+ifndef sbindir
+sbindir = $(exec_prefix)/sbin
+endif
+
 # Where to install the Info files.
 ifndef infodir
 infodir = $(prefix)/info
@@ -163,8 +168,8 @@ endif
 
 # Where to install default configuration files.  These include the local
 # timezone specification and network data base files.
-ifndef etcdir
-etcdir = $(prefix)/etc
+ifndef sysconfdir
+sysconfdir = $(prefix)/etc
 endif
 
 # What timezone should be the installed default (e.g., US/Eastern).
diff --git a/Makerules b/Makerules
index 9349739d50..d50570432c 100644
--- a/Makerules
+++ b/Makerules
@@ -342,8 +342,10 @@ objects objs: $(objects)
 # files in $(install-lib) matching `lib%.a' are ranlib'd after installation
 # unless they also appear in $(non-lib.a).  $(install-data) are installed
 # as they are into $(datadir).  $(headers) are installed as they are in
-# $(includedir).  $(install-others) are absolute path names of files to
-# install; rules to install them are defined elsewhere.
+# $(includedir).  $(install-bin) and $(install-sbin) are installed from the
+# object directory into $(bindir) and $(sbindir), respectively.
+# $(install-others) are absolute path names of files to install; rules to
+# install them are defined elsewhere.
 
 define do-install
 $(make-target-directory)
@@ -376,8 +378,13 @@ $(libdir)/lib$(libprefix)c.a: libobjs subdir_install
 	$(RANLIB) $@
 endif
 
-ifdef install
-$(addprefix $(bindir)/,$(install)): $(bindir)/%: $(objpfx)%
+ifdef install-bin
+$(addprefix $(bindir)/,$(install-bin)): $(bindir)/%: $(objpfx)%
+	$(make-target-directory)
+	$(INSTALL_PROGRAM) $< $@
+endif
+ifdef install-sbin
+$(addprefix $(sbindir)/,$(install-sbin)): $(sbindir)/%: $(objpfx)%
 	$(make-target-directory)
 	$(INSTALL_PROGRAM) $< $@
 endif
diff --git a/posix/Makefile b/posix/Makefile
index 5d2ee59de4..b593239152 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -47,7 +47,7 @@ routines	:= $(sort $(foreach f,$(routines),$f $(f:__%=%)))
 aux		:= init-posix environ
 tests		:= tstgetopt testfnm
 others		:= getconf
-install		:= getconf
+install-bin	:= getconf
 install-lib	:= libposix.a
 gpl2lgpl := getopt.c getopt1.c getopt.h	# Frob these guys' copying notices.
 
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 3030d6017d..6a5f895722 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -52,7 +52,7 @@ rpcsvc = bootparam.x nlm_prot.x rstat.x \
 	 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
 	 rnusers.x spray.x nfs_prot.x rquota.x yp.x
 install-others = $(includedir)/rpcsvc/bootparam_prot.h \
-		 $(etcdir)/rpc
+		 $(sysconfdir)/rpc
 generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c)
 
 routines := auth_none auth_unix authuxprot bindrsvprt \
@@ -65,7 +65,8 @@ routines := auth_none auth_unix authuxprot bindrsvprt \
 	    xdr_rec xdr_ref xdr_stdio
 
 install-lib := librpcsvc.a
-install := rpcgen rpcinfo portmap
+install-bin := rpcgen
+install-sbin := rpcinfo portmap
 rpcsvc-objs = $(rpcsvc:%.x=x%.o)
 rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
 	      rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o
@@ -94,10 +95,10 @@ $(includedir)/rpcsvc/bootparam_prot.h: $(includedir)/rpcsvc/bootparam.h
 	-$(do-install)
 
 # Install the rpc data base file.
-$(etcdir)/rpc: etc.rpc
+$(sysconfdir)/rpc: etc.rpc
 	$(do-install)
 
-defines := $(defines) -D_PATH_RPC='"$(etcdir)/rpc"'
+defines := $(defines) -D_PATH_RPC='"$(sysconfdir)/rpc"'
 
 # Build the `rpcsvc' library of XDR functions.
 
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index 521a22cf05..c3d4a4e121 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -47,7 +47,8 @@ DEFUN(sendto, (fd, buf, n, flags, addr, addr_len),
 			      /* Send the data.  */
 			      err = __socket_send (port, aport,
 						   flags, buf, n,
-						   NULL, 0, NULL,
+						   NULL,
+						   MACH_MSG_TYPE_COPY_SEND, 0,
 						   NULL, 0, &wrote);
 			      __mach_port_deallocate (__mach_task_self (),
 						      aport);
diff --git a/sysdeps/unix/bsd/sun/signum.h b/sysdeps/unix/bsd/sun/signum.h
index f990fefdcd..ea83d710f6 100644
--- a/sysdeps/unix/bsd/sun/signum.h
+++ b/sysdeps/unix/bsd/sun/signum.h
@@ -20,7 +20,7 @@ Cambridge, MA 02139, USA.  */
 #ifdef	_SIGNAL_H
 
 /* This file defines the fake signal functions and signal
-   number constants for 4.2 or 4.3 BSD-derived Unix system.  */
+   number constants for SunOS 3 and 4 Unix systems.  */
 
 /* Fake signal functions.  */
 #define	SIG_ERR	((__sighandler_t) -1) /* Error return.  */
diff --git a/sysdeps/unix/sysv/sco3.2.4/getgroups.c b/sysdeps/unix/sysv/sco3.2.4/getgroups.c
index c83d6ba58b..82e5fbab64 100644
--- a/sysdeps/unix/sysv/sco3.2.4/getgroups.c
+++ b/sysdeps/unix/sysv/sco3.2.4/getgroups.c
@@ -20,6 +20,7 @@ Cambridge, MA 02139, USA.  */
 #include <sys/types.h>
 #include <unistd.h>
 #include <limits.h>
+#include <alloca.h>
 
 extern int __sco_getgroups __P ((int size, unsigned short int *list));
 
diff --git a/sysdeps/unix/sysv/sco3.2.4/uname.S b/sysdeps/unix/sysv/sco3.2.4/uname.S
index 4500c578eb..a22d18a3e6 100644
--- a/sysdeps/unix/sysv/sco3.2.4/uname.S
+++ b/sysdeps/unix/sysv/sco3.2.4/uname.S
@@ -31,7 +31,7 @@ Cambridge, MA 02139, USA.  */
 ENTRY (uname)
 	pushl $0x0		/* Push the discriminator flag.  */
 	pushl $0x0		/* Push dummy placeholder.  */
-	pushl 12(%esp,1)	/* Push name (ptr to struct utsname)  */
+	pushl 12(%esp,1)	/* Push NAME (ptr to struct utsname)  */
 	subl $0x4, %esp		/* Adjust stack pointer.  */
 	DO_CALL (utssys, 3)
 	jb error		/* Test for error.  */
diff --git a/time/Makefile b/time/Makefile
index 6cff119b91..a24d159465 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -42,7 +42,7 @@ tzfiles := africa antarctica asia australasia europe northamerica \
 # northamerica.
 distribute := $(distribute) $(tzfiles) leapseconds pacificnew
 
-install := zic zdump
+install-sbin := zic zdump
 
 include ../Makeconfig	# Get objpfx defined so we can use it below.