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

Use LIBNAME for multilib so as not to conflict with LIB

Browse Source
This commit is contained in:
Roy Marples
2008-01-05 21:05:19 +00:00
parent 75815abd6c
commit ddb3ab4704
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -9,7 +9,7 @@ with every other make too.
You may wish to tweak the installation with the below arguments You may wish to tweak the installation with the below arguments
PROGLDFLAGS=-static PROGLDFLAGS=-static
LIB=lib64 LIBNAME=lib64
DESTDIR=/tmp/openrc-image DESTDIR=/tmp/openrc-image
PAM=pam PAM=pam
TERMCAP=ncurses TERMCAP=ncurses

8
default.mk
View File

@@ -1,10 +1,10 @@
# Common makefile settings # Common makefile settings
# We shouldn't use PREFIX as we need to install into / # We shouldn't use PREFIX as we need to install into /
_LIB_SH = l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac _LIBNAME_SH = l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
_LIB != $(_LIB_SH) _LIBNAME != $(_LIB_SH)
LIB = $(_LIB)$(shell $(_LIB_SH)) LIBNAME = $(_LIBNAME)$(shell $(_LIBNAME_SH))
RC_LIB = /$(LIB)/rc RC_LIB = /$(LIBNAME)/rc
INSTALL ?= install INSTALL ?= install

6
sh/Makefile
View File

@@ -10,10 +10,10 @@ include Makefile.$(OS)
install:: install::
@# Handle lib correctly @# Handle lib correctly
if test $(LIB) != "lib"; then \ if test $(LIBNAME) != "lib"; then \
sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$?; \ sed -i'.bak' -e 's,/lib/,/$(LIBNAME)/,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/,/$(LIBNAME)/,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 @# Provide an init script for the loopback interface