From 77f9015f0bf09c5ef3c51009e21d8e687006c3e4 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 19 Sep 2007 13:53:40 +0000
Subject: /lib/rcscripts -> /lib/rc

---
 src/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 93e71d26..4da64061 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,6 +41,7 @@ CFLAGS += -pedantic -std=c99 \
 
 DESTDIR =
 LIB = lib
+RC_LIB = /$(LIB)/rc
 
 # Set PAM = pam for pam support
 PAM = 
@@ -134,13 +135,13 @@ install: $(TARGET)
 	install -m 0755 -d $(DESTDIR)/sbin
 	install -m 0755 $(SBIN_TARGETS) $(DESTDIR)/sbin
 	ln -sf rc-update $(DESTDIR)/sbin/update-rc
-	install -m 0755 -d $(DESTDIR)/$(LIB)/rcscripts/conf.d
-	install -m 0644 $(SYS_WHITELIST) $(DESTDIR)/$(LIB)/rcscripts/conf.d
-	install -m 0755 -d $(DESTDIR)/$(LIB)/rcscripts/bin
+	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
 	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)/$(LIB)/rcscripts/bin/$$x; done
-	if test "$(PAM)" != "pam" ; then \
+	for x in $(RCLINKS); do ln -sf ../../../sbin/rc $(DESTDIR)/$(RC_LIB)/bin/$$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 ; \
 	fi
-- 
cgit v1.2.3