emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the linking of files in /etc/init.d into the sh/Makefile so that install -jN works.

Browse Source
This commit is contained in:
Roy Marples 2008-01-03 14:49:34 +00:00
parent 3a1cc82a8d
commit 19765f289c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,8 +13,6 @@ include $(TOPDIR)/default.mk
include $(TOPDIR)/Makefile.$(OS) include $(TOPDIR)/Makefile.$(OS)
install:: 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)/init.d
$(INSTALL) -d $(DESTDIR)$(RC_LIB)/tmp $(INSTALL) -d $(DESTDIR)$(RC_LIB)/tmp

7
sh/Makefile
View File

@ -6,10 +6,15 @@ TOPDIR = ..
include $(TOPDIR)/default.mk include $(TOPDIR)/default.mk
install:: install::
# Handle lib correctly @# Handle lib correctly
if test $(LIB) != "lib"; then \ if test $(LIB) != "lib"; then \
sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$?; \ sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$?; \
rm -f $(DESTDIR)/$(RC_LIB)/sh/functions.sh.bak; \ 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 $$?; \ 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; \ rm -f $(DESTDIR)/$(RC_LIB)/sh/rc-functions.sh.bak; \
fi 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 $$?