summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-10-17 13:30:40 +0200
committerKoen Kooi <koen@openembedded.org>2008-10-17 13:30:40 +0200
commit836ec75f624fe115899c5840357e62cd1f31b968 (patch)
tree445b4bf0444de39ae2fe1ff6e244d43e00be3d6d
parentf93dd081ef5ce142b3f7b0d5487140879ff703fd (diff)
parentc6a02df9feb64fc077c5a195de03a875cd3d0c02 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--packages/libsdl/libsdl-image.inc2
-rw-r--r--packages/libsdl/libsdl-image_1.2.3.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/libsdl/libsdl-image.inc b/packages/libsdl/libsdl-image.inc
index 1212e9cfa6..b52db71511 100644
--- a/packages/libsdl/libsdl-image.inc
+++ b/packages/libsdl/libsdl-image.inc
@@ -10,6 +10,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
inherit autotools
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
do_stage() {
oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 81bb7504e6..199945e4bc 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -6,8 +6,6 @@ SRC_URI += "\
file://autotools.patch;patch=1 \
"
-export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
-
inherit autotools
do_stage() {