From fb1698793fc07654b3498462e9aefec62f7aa809 Mon Sep 17 00:00:00 2001
From: Stefan Hilzinger <hilzinger@google.com>
Date: Tue, 22 Feb 2011 12:00:40 +0000
Subject: Fixing the standalone build of the emulator.

Change-Id: I81567b512df04314d87dd3846b02d8895829937d
---
 distrib/sdl-1.2.12/Makefile.android     | 4 ++--
 distrib/sdl-1.2.12/android-configure.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'distrib')

diff --git a/distrib/sdl-1.2.12/Makefile.android b/distrib/sdl-1.2.12/Makefile.android
index 4e89fc7..2dfa7dd 100644
--- a/distrib/sdl-1.2.12/Makefile.android
+++ b/distrib/sdl-1.2.12/Makefile.android
@@ -85,8 +85,8 @@ SDL_HEADERS := \
 $(foreach target,$(INSTALL_TARGETS),\
   $(eval $(call install-target,objs/sdl-config,$(target)/bin/sdl-config)) \
   $(eval $(call install-target,objs/SDL_config.h,$(target)/include/SDL/SDL_config.h)) \
-  $(eval $(call install-target,objs/libSDL.a,$(target)/lib/libSDL.a)) \
-  $(eval $(call install-target,objs/libSDLmain.a,$(target)/lib/libSDLmain.a)) \
+  $(eval $(call install-target,objs/libs/libSDL.a,$(target)/libs/libSDL.a)) \
+  $(eval $(call install-target,objs/libs/libSDLmain.a,$(target)/libs/libSDLmain.a)) \
   $(foreach header,$(SDL_HEADERS), \
     $(eval $(call install-target,include/$(header),$(target)/include/SDL/$(header))) \
   ) \
diff --git a/distrib/sdl-1.2.12/android-configure.sh b/distrib/sdl-1.2.12/android-configure.sh
index 133daf4..95bb91f 100755
--- a/distrib/sdl-1.2.12/android-configure.sh
+++ b/distrib/sdl-1.2.12/android-configure.sh
@@ -479,7 +479,7 @@ generate_sdl_config ()
     # replace @exec_prefix@ with "{prefix}", and @libdir@ with "{libdir}"
     cat > $TMPC <<EOF
 s!@exec_prefix@!\$\{prefix\}!g
-s!@libdir@!\$\{exec_prefix\}/lib!g
+s!@libdir@!\$\{exec_prefix\}/libs!g
 s!@includedir@!\$\{prefix\}/include!g
 EOF
 
-- 
cgit v1.1