From cc96c0933d3fc82e6a7f687bf18705bae62e550a Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 3 Jan 2008 15:48:33 +0000
Subject: Juggle the Makefiles so that sh knows about NET_LO

---
 Makefile          | 1 -
 Makefile.BSD      | 1 -
 Makefile.Linux    | 1 -
 sh/Makefile       | 7 +++++--
 sh/Makefile.BSD   | 1 +
 sh/Makefile.Linux | 1 +
 6 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 Makefile.BSD
 delete mode 100644 Makefile.Linux
 create mode 100644 sh/Makefile.BSD
 create mode 100644 sh/Makefile.Linux

diff --git a/Makefile b/Makefile
index 2d680bd9..55d8c6aa 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ SUBDIR = conf.d doc etc init.d man net runlevels sh src
 
 TOPDIR = .
 include $(TOPDIR)/default.mk
-include $(TOPDIR)/Makefile.$(OS)
 
 install::
 	$(INSTALL) -d $(DESTDIR)$(RC_LIB)/init.d
diff --git a/Makefile.BSD b/Makefile.BSD
deleted file mode 100644
index f1e45618..00000000
--- a/Makefile.BSD
+++ /dev/null
@@ -1 +0,0 @@
-NET_LO = net.lo0
diff --git a/Makefile.Linux b/Makefile.Linux
deleted file mode 100644
index 219c92fb..00000000
--- a/Makefile.Linux
+++ /dev/null
@@ -1 +0,0 @@
-NET_LO = net.lo
diff --git a/sh/Makefile b/sh/Makefile
index c682eeb3..bc8ddae3 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -5,6 +5,9 @@ BIN = gendepends.sh net.sh runscript.sh
 TOPDIR = ..
 include $(TOPDIR)/default.mk
 
+# To get NET_LO
+include Makefile.$(OS)
+
 install::
 	@# Handle lib correctly
 	if test $(LIB) != "lib"; then \
@@ -14,7 +17,7 @@ install::
 		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 $$?
+	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 $$?
+	ln -snf $(RC_LIB)/sh/functions.sh $(DESTDIR)/etc/init.d || exit $$?
diff --git a/sh/Makefile.BSD b/sh/Makefile.BSD
new file mode 100644
index 00000000..f1e45618
--- /dev/null
+++ b/sh/Makefile.BSD
@@ -0,0 +1 @@
+NET_LO = net.lo0
diff --git a/sh/Makefile.Linux b/sh/Makefile.Linux
new file mode 100644
index 00000000..219c92fb
--- /dev/null
+++ b/sh/Makefile.Linux
@@ -0,0 +1 @@
+NET_LO = net.lo
-- 
cgit v1.2.3