From 11a1a4fb75f8d819a60d30dce30934d8088f38b0 Mon Sep 17 00:00:00 2001
From: Christian Wiese <morfoh@opensde.org>
Date: Sat, 9 Feb 2008 22:07:30 +0200
Subject: [PATCH] Changed fhs to create the proper lib dirs for multilib and
 set the default to SDECFG_ABI_DEFAULT

---
 base/fhs/fhs-3-lib.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/base/fhs/fhs-3-lib.sh b/base/fhs/fhs-3-lib.sh
index 7487d3435..633feb707 100644
--- a/base/fhs/fhs-3-lib.sh
+++ b/base/fhs/fhs-3-lib.sh
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../fhs/fhs-3-lib.sh
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2008 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -17,7 +17,7 @@ lib=
 if [ "$SDECFG_MULTILIB" = 1 ]; then
 	case $arch_machine in
 		powerpc64|sparc64|x86_64|mips64)
-			lib=lib64 ;;
+			lib="lib${SDECFG_ABI_DEFAULT}" ;;
 	esac
 fi
 
@@ -25,8 +25,9 @@ for x in '' 'usr/' 'usr/local/'; do
 	if [ -z "$lib" ]; then
 		echo "m ${x}lib"
 	else
-		echo "m ${x}lib32"
-		echo "m ${x}lib64"
+		for abi in $arch_abis; do
+			echo "m ${x}lib${abi}"
+		done
 		echo "l ${x}lib $lib"
 	fi
 done