diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-12-06 22:28:14 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-12-06 22:28:14 +0000 |
commit | 7a9fd0baae1ea39fadb982841b34313db06825c8 (patch) | |
tree | 8151379d419b2fed6497401aeca4193852824ab1 /tools | |
parent | 2c2416094f426972c9e2e96d25058311bbe82f97 (diff) | |
download | rockbox-7a9fd0baae1ea39fadb982841b34313db06825c8.tar.gz rockbox-7a9fd0baae1ea39fadb982841b34313db06825c8.zip |
Fix configure and lib path
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28753 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/tools/configure b/tools/configure index b8cabe79d0..ac24f5bd43 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -24,6 +24,7 @@ rbdir="/.rockbox" | |||
24 | need_full_path= | 24 | need_full_path= |
25 | bindir= | 25 | bindir= |
26 | libdir= | 26 | libdir= |
27 | sharedir= | ||
27 | 28 | ||
28 | app_platform= | 29 | app_platform= |
29 | app_lcd_width= | 30 | app_lcd_width= |
@@ -86,7 +87,7 @@ app_get_platform() { | |||
86 | # setup files and paths depending on the platform | 87 | # setup files and paths depending on the platform |
87 | if [ "$app_platform" = "sdl" ]; then | 88 | if [ "$app_platform" = "sdl" ]; then |
88 | if [ -z "$ARG_PREFIX" ]; then | 89 | if [ -z "$ARG_PREFIX" ]; then |
89 | rbdir="/usr/local/share/rockbox" | 90 | sharedir="/usr/local/share/rockbox" |
90 | bindir="/usr/local/bin" | 91 | bindir="/usr/local/bin" |
91 | libdir="/usr/local/lib" | 92 | libdir="/usr/local/lib" |
92 | else | 93 | else |
@@ -98,7 +99,7 @@ app_get_platform() { | |||
98 | exit | 99 | exit |
99 | fi | 100 | fi |
100 | fi | 101 | fi |
101 | rbdir="$ARG_PREFIX/share/rockbox" | 102 | sharedir="$ARG_PREFIX/share/rockbox" |
102 | bindir="$ARG_PREFIX/bin" | 103 | bindir="$ARG_PREFIX/bin" |
103 | libdir="$ARG_PREFIX/lib" | 104 | libdir="$ARG_PREFIX/lib" |
104 | else | 105 | else |
@@ -122,7 +123,7 @@ app_get_platform() { | |||
122 | echo "environment variable point to the root directory of the Android NDK." | 123 | echo "environment variable point to the root directory of the Android NDK." |
123 | exit | 124 | exit |
124 | fi | 125 | fi |
125 | rbdir="/data/data/org.rockbox/app_rockbox/rockbox" | 126 | sharedir="/data/data/org.rockbox/app_rockbox/rockbox" |
126 | bindir="/data/data/org.rockbox/lib" | 127 | bindir="/data/data/org.rockbox/lib" |
127 | libdir="/data/data/org.rockbox/app_rockbox" | 128 | libdir="/data/data/org.rockbox/app_rockbox" |
128 | output="librockbox.so" | 129 | output="librockbox.so" |
@@ -3144,14 +3145,7 @@ else | |||
3144 | defendian="ROCKBOX_LITTLE_ENDIAN" | 3145 | defendian="ROCKBOX_LITTLE_ENDIAN" |
3145 | fi | 3146 | fi |
3146 | 3147 | ||
3147 | if [ "$ARG_RBDIR" ]; then | 3148 | if [ "$ARG_RBDIR" != "" ]; then |
3148 | if [ "$need_full_path" != "yes" ]; then | ||
3149 | if [ -z `echo $ARG_RBDIR | grep '^/'` ]; then | ||
3150 | rbdir="/"$ARG_RBDIR | ||
3151 | else | ||
3152 | rbdir=$ARG_RBDIR | ||
3153 | fi | ||
3154 | fi | ||
3155 | echo "Using alternate rockbox dir: ${rbdir}" | 3149 | echo "Using alternate rockbox dir: ${rbdir}" |
3156 | fi | 3150 | fi |
3157 | 3151 | ||
@@ -3162,6 +3156,7 @@ sed > autoconf.h \ | |||
3162 | -e "s<@config_rtc@<$config_rtc<g" \ | 3156 | -e "s<@config_rtc@<$config_rtc<g" \ |
3163 | -e "s<@have_rtc_alarm@<$have_rtc_alarm<g" \ | 3157 | -e "s<@have_rtc_alarm@<$have_rtc_alarm<g" \ |
3164 | -e "s<@RBDIR@<${rbdir}<g" \ | 3158 | -e "s<@RBDIR@<${rbdir}<g" \ |
3159 | -e "s<@sharepath@<${sharedir}<g" \ | ||
3165 | -e "s<@binpath@<${bindir}<g" \ | 3160 | -e "s<@binpath@<${bindir}<g" \ |
3166 | -e "s<@libpath@<${libdir}<g" \ | 3161 | -e "s<@libpath@<${libdir}<g" \ |
3167 | -e "s<@have_backlight@<$have_backlight<g" \ | 3162 | -e "s<@have_backlight@<$have_backlight<g" \ |
@@ -3202,6 +3197,7 @@ sed > autoconf.h \ | |||
3202 | 3197 | ||
3203 | /* root of Rockbox */ | 3198 | /* root of Rockbox */ |
3204 | #define ROCKBOX_DIR "@RBDIR@" | 3199 | #define ROCKBOX_DIR "@RBDIR@" |
3200 | #define ROCKBOX_SHARE_PATH "@sharepath@" | ||
3205 | #define ROCKBOX_BINARY_PATH "@binpath@" | 3201 | #define ROCKBOX_BINARY_PATH "@binpath@" |
3206 | #define ROCKBOX_LIBRARY_PATH "@libpath@" | 3202 | #define ROCKBOX_LIBRARY_PATH "@libpath@" |
3207 | 3203 | ||
@@ -3332,6 +3328,7 @@ sed > Makefile \ | |||
3332 | -e "s<@LANGS@<${buildlangs}<g" \ | 3328 | -e "s<@LANGS@<${buildlangs}<g" \ |
3333 | -e "s<@USE_ELF@<${USE_ELF}<g" \ | 3329 | -e "s<@USE_ELF@<${USE_ELF}<g" \ |
3334 | -e "s<@RBDIR@<${rbdir}<g" \ | 3330 | -e "s<@RBDIR@<${rbdir}<g" \ |
3331 | -e "s<@sharepath@<${sharedir}<g" \ | ||
3335 | -e "s<@binpath@<${bindir}<g" \ | 3332 | -e "s<@binpath@<${bindir}<g" \ |
3336 | -e "s<@libpath@<${libdir}<g" \ | 3333 | -e "s<@libpath@<${libdir}<g" \ |
3337 | -e "s<@PREFIX@<$ARG_PREFIX<g" \ | 3334 | -e "s<@PREFIX@<$ARG_PREFIX<g" \ |
@@ -3401,7 +3398,8 @@ export ENC_OPTS=@ENC_OPTS@ | |||
3401 | export ENCODER=@ENCODER@ | 3398 | export ENCODER=@ENCODER@ |
3402 | export USE_ELF=@USE_ELF@ | 3399 | export USE_ELF=@USE_ELF@ |
3403 | export RBDIR=@RBDIR@ | 3400 | export RBDIR=@RBDIR@ |
3404 | export ROCKBOX_BINARY_PATH=@binpath@ | 3401 | export ROCKBOX_SHARE_PATH=@sharepath@ |
3402 | export ROCKBOX_LIBRARY_PATH=@libpath@ | ||
3405 | export ROCKBOX_LIBRARY_PATH=@libpath@ | 3403 | export ROCKBOX_LIBRARY_PATH=@libpath@ |
3406 | export SDLCONFIG=@SDLCONFIG@ | 3404 | export SDLCONFIG=@SDLCONFIG@ |
3407 | 3405 | ||