fl_wrapper: add support for /lib/x86_64-linux-gnu/libc.so.6 style

bin/sde-build-tools

@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: bin/sde-build-tools
-# Copyright (C) 2006 - 2012 The OpenSDE Project
+# Copyright (C) 2006 - 2013 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -301,7 +301,8 @@ EOT
 	#
 	if [ "$SDECFG_FLIST" = "flwrapper" ] ; then
 		echo_status "Building $toolsdir/lib/fl_wrapper.so."
-		FLWRAPPER_LIBC=$( ls $xroot/{lib64,lib}/libc.* 2>/dev/null |
+		FLWRAPPER_LIBC=$(ls -1 "$xroot"/{lib64,lib}/libc.* \
+			"$xroot"/{lib64,lib}/*/libc.* 2>/dev/null |
 		                  head -n1 )
 		if [ ! -f "$FLWRAPPER_LIBC" ]; then
 			abort 'Unable to detect /lib/libc.* for flwrapper'

bin/sde-check-system

@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: bin/sde-check-system
-# Copyright (C) 2006 - 2011 The OpenSDE Project
+# Copyright (C) 2006 - 2013 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -134,7 +134,7 @@ case $BASH_VERSION in
 	found_error=1
 esac
 
-if ! ls -1d /usr/lib*/libc.a > /dev/null 2>&1; then
+if [ -z "$(ls -1d /usr/lib*/libc.a /usr/lib*/*/libc.a 2> /dev/null)" ]; then
 	cat <<-EOT
 	Paranoia Check: File '/usr/lib*/libc.a' not found!
 	Without the static library of your libC you wont be able to