From e95cea3d862f1bd41d74213ff2b4bbcd5f97afd0 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Mon, 24 Sep 2007 12:09:43 +0000
Subject: Split our rc commands out into general use vs service commands

---
 src/Makefile | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index fd79b187..288e43d8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,22 +65,23 @@ LIB_TARGETS = $(LIBEINFOSO) $(LIBRCSO)
 SBIN_TARGETS = rc
 SYS_WHITELIST = env_whitelist
 
-TARGET = $(LIB_TARGETS) $(BIN_TARGETS) $(SBIN_TARGETS) $(PRIV_BIN_TARGETS)
-
-RCLINKS = einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
-	      eindent eoutdent esyslog eval_ecolors \
-	      veinfo vewarn vebegin veend vewend veindent veoutdent \
-	      service_starting service_inactive service_started \
-	      service_stopping service_stopped \
-	      service_inactive service_wasinactive \
-	      service_coldplugged \
-	      mark_service_starting mark_service_inactive mark_service_started \
-	      mark_service_stopping mark_service_stopped \
-	      mark_service_inactive mark_service_wasinactive \
-	      mark_service_coldplugged \
-	      get_options save_options rc-abort rc-depend \
-	      is_runlevel_start is_runlevel_stop service_started_daemon \
-		  checkown fstabinfo mountinfo
+TARGET = $(LIB_TARGETS) $(BIN_TARGETS) $(SBIN_TARGETS)
+
+RC_BINLINKS = einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
+			  eindent eoutdent esyslog eval_ecolors \
+			  veinfo vewarn vebegin veend vewend veindent veoutdent \
+			  service_starting service_inactive service_started \
+			  service_stopping service_stopped \
+			  service_inactive service_wasinactive \
+			  service_coldplugged \
+			  is_runlevel_start is_runlevel_stop service_started_daemon \
+			  checkown fstabinfo mountinfo rc-depend
+RC_SBINLINKS =  mark_service_starting mark_service_inactive \
+				mark_service_started \
+				mark_service_stopping mark_service_stopped \
+				mark_service_inactive mark_service_wasinactive \
+				mark_service_coldplugged \
+				get_options save_options rc-abort
 BINLINKS = rc-status
 SBINLINKS = env-update rc-update runscript start-stop-daemon
 
@@ -122,7 +123,7 @@ rc: $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
 	$(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LDLIBS) $(LDLIBS_RC)
 
 links: rc
-	for x in $(BINLINKS) $(SBINLINKS) $(RCLINKS) $(RCPRIVLINKS); do ln -sf rc $$x; done
+	for x in $(BINLINKS) $(SBINLINKS) $(RC_BINLINKS) $(RC_SBINLINKS); do ln -sf rc $$x; done
 
 install: $(TARGET)
 	install -m 0755 -d $(DESTDIR)/$(LIB)
@@ -138,9 +139,11 @@ install: $(TARGET)
 	install -m 0755 -d $(DESTDIR)/$(RC_LIB)/conf.d
 	install -m 0644 $(SYS_WHITELIST) $(DESTDIR)/$(RC_LIB)/conf.d
 	install -m 0755 -d $(DESTDIR)/$(RC_LIB)/bin
+	install -m 0755 -d $(DESTDIR)/$(RC_LIB)/sbin
 	for x in $(BINLINKS); do ln -sf ../sbin/rc $(DESTDIR)/bin/$$x; done
 	for x in $(SBINLINKS); do ln -sf rc $(DESTDIR)/sbin/$$x; done
-	for x in $(RCLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(RC_LIB)/bin/$$x; done
+	for x in $(RC_BINLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(RC_LIB)/bin/$$x; done
+	for x in $(RC_SBINLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(RC_LIB)/sbin/$$x; done
 	if test "$(PAM)" = "pam" ; then \
 		install -m 0755 -d $(DESTDIR)/etc/pam.d ; \
 		install -m 0644 start-stop-daemon.pam $(DESTDIR)/etc/pam.d/start-stop-daemon ; \
-- 
cgit v1.2.3