From 19765f289c109658252f67b31b869c64b015e454 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 3 Jan 2008 14:49:34 +0000
Subject: Move the linking of files in /etc/init.d into the sh/Makefile so that
 install -jN works.

---
 Makefile    | 2 --
 sh/Makefile | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ddd60b8..2d680bd 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,6 @@ include $(TOPDIR)/default.mk
 include $(TOPDIR)/Makefile.$(OS)
 
 install::
-	ln -snf /$(RC_LIB)/sh/net.sh $(DESTDIR)/etc/init.d/$(NET_LO) || exit $$?
-	ln -snf /$(RC_LIB)/sh/functions.sh $(DESTDIR)/etc/init.d || exit $$?
 	$(INSTALL) -d $(DESTDIR)$(RC_LIB)/init.d
 	$(INSTALL) -d $(DESTDIR)$(RC_LIB)/tmp
 
diff --git a/sh/Makefile b/sh/Makefile
index 302ff53..c682eeb 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -6,10 +6,15 @@ TOPDIR = ..
 include $(TOPDIR)/default.mk
 
 install::
-	# Handle lib correctly
+	@# Handle lib correctly
 	if test $(LIB) != "lib"; then \
 		sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$?; \
 		rm -f $(DESTDIR)/$(RC_LIB)/sh/functions.sh.bak; \
 		sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/rc-functions.sh || exit $$?; \
 		rm -f $(DESTDIR)/$(RC_LIB)/sh/rc-functions.sh.bak; \
 	fi
+	@# Provide an init script for the loopback interface
+	ln -snf /$(RC_LIB)/sh/net.sh $(DESTDIR)/etc/init.d/$(NET_LO) || exit $$?
+	@# Put functions.sh into the init.d dir so 3rd part apps don't have to
+	@# be multilib aware
+	ln -snf /$(RC_LIB)/sh/functions.sh $(DESTDIR)/etc/init.d || exit $$?
-- 
cgit v1.2.3