From ddb3ab47046dcedd88ffbf84a44a0a42438bc9e3 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sat, 5 Jan 2008 21:05:19 +0000
Subject: [PATCH] Use LIBNAME for multilib so as not to conflict with LIB

---
 README      | 2 +-
 default.mk  | 8 ++++----
 sh/Makefile | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 8159e5c9..056971bb 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ with every other make too.
 
 You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
-LIB=lib64
+LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
 PAM=pam
 TERMCAP=ncurses
diff --git a/default.mk b/default.mk
index 580648c7..51be6859 100644
--- a/default.mk
+++ b/default.mk
@@ -1,10 +1,10 @@
 # Common makefile settings
 # 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
-_LIB != $(_LIB_SH)
-LIB = $(_LIB)$(shell $(_LIB_SH))
-RC_LIB = /$(LIB)/rc
+_LIBNAME_SH = l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
+_LIBNAME != $(_LIB_SH)
+LIBNAME = $(_LIBNAME)$(shell $(_LIBNAME_SH))
+RC_LIB = /$(LIBNAME)/rc
 
 INSTALL ?= install
 
diff --git a/sh/Makefile b/sh/Makefile
index bc8ddae3..225d9f15 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -10,10 +10,10 @@ include Makefile.$(OS)
 
 install::
 	@# Handle lib correctly
-	if test $(LIB) != "lib"; then \
-		sed -i'.bak' -e 's,/lib/,/$(LIB)/,g' $(DESTDIR)/$(RC_LIB)/sh/functions.sh || exit $$?; \
+	if test $(LIBNAME) != "lib"; then \
+		sed -i'.bak' -e 's,/lib/,/$(LIBNAME)/,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 $$?; \
+		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; \
 	fi
 	@# Provide an init script for the loopback interface