From 186238e87ad5dfeb61a27877d365e61e8aa94ef2 Mon Sep 17 00:00:00 2001
From: roland <roland>
Date: Sat, 16 Jul 1994 21:34:37 +0000
Subject: [PATCH] entered into RCS

---
 Makerules       | 15 +++++++++++----
 posix/Makefile  |  2 +-
 sunrpc/Makefile |  9 +++++----
 time/Makefile   |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

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/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.
 
-- 
2.11.0