From 177e816d19ec86cce4d47243c1e51d3bcee46ec8 Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Tue, 8 May 2012 17:24:32 +0400
Subject: [PATCH] Changes to Makefile.

---
 Makefile             | 23 ++++++++++++-----------
 sbin/snail.configure |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index af4940b..8c4f291 100644
--- a/Makefile
+++ b/Makefile
@@ -10,26 +10,27 @@ install:
 	install bin/* ${DESTDIR}/${PREFIX}/bin
 	install -d ${DESTDIR}/${PREFIX}/sbin
 	install sbin/* ${DESTDIR}/${PREFIX}/sbin
-	-if test x86_64 = `uname -m` ; then \
-		install -d ${DESTDIR}/${PREFIX}/lib64; \
-		install lib64/*.so ${DESTDIR}/${PREFIX}/lib64; \
-		install -d ${DESTDIR}/${PREFIX}/lib64/snail; \
-		if test -d /usr/lib64 -a ! -d /usr/lib ; then \
-			ln -sf lib64 /usr/lib; \
+	if test x86_64 = `uname -m` ; then \
+		if test -d /usr/lib64 ; then \
+			install -d ${DESTDIR}/${PREFIX}/lib64; \
+			install lib64/*.so ${DESTDIR}/${PREFIX}/lib64; \
 		else \
-			if test -d /usr/lib -a ! -d /usr/lib64 ; then \
-				ln -sf lib /usr/lib64; \
-			fi; \
+			install -d ${DESTDIR}/${PREFIX}/lib; \
+			install lib64/*.so ${DESTDIR}/${PREFIX}/lib; \
 		fi; \
+		if test ! -d /usr/lib ; then \
+			ln -sf lib64 /usr/lib; \
+		fi; \
+		install -d ${DESTDIR}/${PREFIX}/lib/snail; \
 	else \
 		install -d ${DESTDIR}/${PREFIX}/lib; \
 		install lib32/*.so ${DESTDIR}/${PREFIX}/lib; \
 		install -d ${DESTDIR}/${PREFIX}/lib/snail; \
-	fi
+	fi; \
 	install -d ${DESTDIR}/${PREFIX}/share; \
 	install -d ${DESTDIR}/${PREFIX}/share/snail; \
 	install -d ${DESTDIR}/${PREFIX}/share/snail/init.d; \
-	install share/init.d/* ${DESTDIR}/${PREFIX}/share/snail/init.d; \
+	install share/init.d/* ${DESTDIR}/${PREFIX}/share/snail/init.d
 
 uninstall:
 	rm -f ${DESTDIR}/etc/X11/xorg.conf.*.snail
diff --git a/sbin/snail.configure b/sbin/snail.configure
index c2d1523..931823a 100755
--- a/sbin/snail.configure
+++ b/sbin/snail.configure
@@ -215,9 +215,10 @@ case "$DISTRIB_ID" in
 
           rm -f /etc/alternatives/x86_64-linux-gnu_gl_conf
           ln -sf /usr/lib/x86_64-linux-gnu/mesa/ld.so.conf /etc/alternatives/x86_64-linux-gnu_gl_conf
+          ldconfig
           rm -f /usr/lib/x86_64-linux-gnu/xorg/extra-modules
           #ln -sf /usr/lib/x86_64-linux-gnu/mesa /usr/lib/x86_64-linux-gnu/xorg/extra-modules
-          ldconfig
+          #ln -sf /usr/lib/opengl/nvidia/lib/libnvidia-tls.so.[0-9][0-9]* /usr/lib/snail/
       ;;
 
       *)