diff options
| author | Roy Marples <roy@marples.name> | 2008-01-03 15:48:33 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-03 15:48:33 +0000 |
| commit | cc96c0933d3fc82e6a7f687bf18705bae62e550a (patch) | |
| tree | 92736f790933f8382bd8a49964cf30a71973db29 | |
| parent | 0176ee89ed256559616fd215f0eda849fbb8f0bd (diff) | |
Juggle the Makefiles so that sh knows about NET_LO
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | sh/Makefile | 7 | ||||
| -rw-r--r-- | sh/Makefile.BSD (renamed from Makefile.BSD) | 0 | ||||
| -rw-r--r-- | sh/Makefile.Linux (renamed from Makefile.Linux) | 0 |
4 files changed, 5 insertions, 3 deletions
@@ -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/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/Makefile.BSD b/sh/Makefile.BSD index f1e45618..f1e45618 100644 --- a/Makefile.BSD +++ b/sh/Makefile.BSD diff --git a/Makefile.Linux b/sh/Makefile.Linux index 219c92fb..219c92fb 100644 --- a/Makefile.Linux +++ b/sh/Makefile.Linux |