darwin: mklib: Make the real file match the id

This makes mesa more consistent with glibtool and XCode where the
generated file matches the dylib id rather using an extra symlink

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

diff --git a/bin/mklib b/bin/mklib
index a511375e20e96ccb3e12732d06f24f43d81f6d41..2c7ed3880ae9f41e9b2dfdc51e1eab0d0de988f9 100755 (executable)
--- a/bin/mklib
+++ b/bin/mklib
@@ -767,9 +767,8 @@ case $ARCH in
                 OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
             fi
 
-            LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
-            LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
-            LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
+            LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
+            LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
 
            # examine first object to determine ABI
            set ${OBJECTS}
@@ -782,9 +781,6 @@ case $ARCH in
                 OPTS=${ALTOPTS}
             fi
 
-           # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-           # to OPTS here?
-
            # determine linker
            if [ $CPLUSPLUS = 1 ] ; then
                LINK="g++"
@@ -796,8 +792,7 @@ case $ARCH in
 
             ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
             ln -s ${LIBNAME} ${LINKNAME}
-            ln -s ${LIBNAME} ${LINKNAME2}
-            FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
+            FINAL_LIBS="${LIBNAME} ${LINKNAME}"
         fi
         ;;