Fix up the -1.2.so symlinks for the other SDL libs.

BKrev: 409df49a9JrL5_hP-m8dlhNwVpJRJQ

diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
index 9c54849..dd51c4f 100644 (file)
--- a/libsdl/libsdl-image_1.2.3.oe
+++ b/libsdl/libsdl-image_1.2.3.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
 inherit autotools libtool
 
 do_stage() {
-       oe_libinstall -so libSDL_image-1.2 ${STAGING_LIBDIR}
-       ln -sf libSDL_image-1.2.so ${STAGING_LIBDIR}/libSDL_image.so
+       oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
+       ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
        install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
 }
 

diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
index 2f51ae2..84eaed5 100644 (file)
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ b/libsdl/libsdl-mixer_1.2.5.oe
@@ -14,8 +14,8 @@ EXTRA_OECONF = "--disable-music-mp3"
 # to deal with optional dependencies
 
 do_stage() {
-       oe_libinstall -so libSDL_mixer-1.2 ${STAGING_LIBDIR}
-       ln -sf libSDL_mixer-1.2.so ${STAGING_LIBDIR}/libSDL_mixer.so
+       oe_libinstall -so libSDL_mixer ${STAGING_LIBDIR}
+       ln -sf libSDL_mixer.so ${STAGING_LIBDIR}/libSDL_mixer-1.2.so
        install -m 0644 SDL_mixer.h ${STAGING_INCDIR}/SDL/SDL_mixer.h
 }
 

diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index 975f8c1..718daa6 100644 (file)
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_net-${PV}"
 inherit autotools libtool
 
 do_stage() {
-       oe_libinstall -so libSDL_net-1.2 ${STAGING_LIBDIR}
-       ln -sf libSDL_net-1.2.so ${STAGING_LIBDIR}/libSDL_net.so
+       oe_libinstall -so libSDL_net ${STAGING_LIBDIR}
+       ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so
        install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
 }
 

diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
index b02210f..5926ad3 100644 (file)
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ b/libsdl/libsdl-ttf_2.0.3.oe
@@ -11,8 +11,7 @@ S = "${WORKDIR}/SDL_ttf-${PV}"
 inherit autotools libtool
 
 do_stage() {
-       oe_libinstall -so libSDL_ttf-2.0 ${STAGING_LIBDIR}
-       ln -sf libSDL_ttf-2.0.so ${STAGING_LIBDIR}/libSDL_ttf.so
+       oe_libinstall -so libSDL_ttf ${STAGING_LIBDIR}
+       ln -sf libSDL_ttf.so ${STAGING_LIBDIR}/libSDL_ttf-1.2.so
        install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h
 }
-