--- trunk/opengl-update/opengl-update.in	2012/11/15 11:55:31	1978
+++ trunk/opengl-update/opengl-update.in	2012/11/15 12:59:19	1984
@@ -241,7 +241,7 @@
 		mkdir -p ${DST_PREFIX}/${LIBDIR}
 		pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null
 			# First remove old symlinks
-			for file in lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
+			for file in lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
 			do
 				[[ -h ${file} ]] && rm -f ${file}
 			done
@@ -249,7 +249,7 @@
 			# Note that we don't do .so*, just .so on purpose.  The
 			# loader knows to look in the profile dir, and the
 			# linked just needs the .so
-			for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
+			for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
 			do
 				[[ -f ${file} ]] || continue
 				[[ -f ${file##*/} ]] && rm -f ${file##*/}
@@ -269,12 +269,12 @@
 			mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
 			pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
 				# First remove old symlinks
-				for file in lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
+				for file in lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
 				do
 					[[ -h ${file} ]] && rm -f ${file}
 				done
 
-				for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
+				for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
 				do
 					[[ -f ${file} ]] || continue
 					[[ -f ${file##*/} ]] && rm -f ${file##*/}
@@ -325,6 +325,7 @@
 		fi
 
 		# Setup the includes
+		local -A headers
 		headers[GL]="gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h"
 		headers[GLES]="egl.h gl_extensions.h glext.h gl.h glplatform.h"
 		headers[GLES2]="gl2ext.h gl2.h gl2platform.h"