diff options
| author | Roy Marples <roy@marples.name> | 2008-01-03 14:49:34 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-03 14:49:34 +0000 |
| commit | 19765f289c109658252f67b31b869c64b015e454 (patch) | |
| tree | 44e793842f0a3bf30e31cadb576f9aeeb3cd900a | |
| parent | 3a1cc82a8dbdfd73426d4120c84c7121118af546 (diff) | |
Move the linking of files in /etc/init.d into the sh/Makefile so that install -jN works.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sh/Makefile | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 302ff531..c682eeb3 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 $$? |