Removing opengl-update-livecd (finally) and updating openglify to work with x11-misc/opengl-update.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@54 7bf51bff-881f-0410-a643-fba68b97345e

1 files changed, 15 insertions, 21 deletions

diff --git a/openglify b/openglify
index 22fa9ca..3a1fa12 100755
--- a/openglify
+++ b/openglify
@@ -1,28 +1,22 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/openglify,v 1.5 2005/03/01 18:13:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/livecd-tools/openglify,v 1.6 2005/05/31 19:08:28 wolf31o2 Exp $
 
-#This script is designed to tweak the system for opengl-update-livecd
+#This script is designed to tweak the system for opengl-update
 #set up our flexible opengl stuff:
 
 #move symlinks to a malleable /etc/opengl directory.
-install -d /etc/opengl
-mv /usr/lib/libGL.* /etc/opengl/
-mv /usr/lib/libGLcore.* /etc/opengl/
-ln -sf /etc/opengl/libGL.so /usr/lib/libGL.so
-ln -sf /etc/opengl/libGL.so.1 /usr/lib/libGL.so.1
-ln -sf /etc/opengl/libGLcore.so /usr/lib/libGLcore.so
-ln -sf /etc/opengl/libGLcore.so.1 /usr/lib/libGLcore.so.1
-mv /usr/lib/libMesaGL.so /etc/opengl/
-ln -sf /etc/opengl/libMesaGL.so /usr/lib/libMesaGL.so
-for x in libglx.a libglx.so
-do
-	if [ -e /usr/lib/modules/extensions/${x} -o -L \
-	/usr/lib/modules/extensions/${x} ] 
-	then
-		mv /usr/lib/modules/extensions/${x} /etc/opengl/
-	fi
-	ln -s /etc/opengl/${x} \
-	/usr/lib/modules/extensions/${x}
-done
+install -d test/lib/modules/extensions
+
+rm /usr/lib/libGL{,core}.{a,so}* > /dev/null 2>&1
+rm /usr/lib/modules/extensions/libglx* > /dev/null 2>&1
+
+ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so
+ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1
+ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so
+ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1
+ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
+	/usr/lib/modules/extensions/libglx.so
+ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
+	/usr/lib/modules/extensions/libglx.a