diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2009-01-08 20:00:10 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2009-01-08 20:00:10 +0000 |
commit | 36122cac6ab457692f545108a99681ad47526ee5 (patch) | |
tree | 55341cde42c1940042da4ed330927e22026ade12 | |
parent | c1b4745d7c2f46bdeda432a8279aac01d47821fd (diff) | |
download | rockbox-36122cac6ab457692f545108a99681ad47526ee5.tar.gz rockbox-36122cac6ab457692f545108a99681ad47526ee5.zip |
rockboxdev.sh now respects the environment variables RBDEV_DOWNLOAD, RBDEV_PREFIX and RBDEV_BUILD to enable setting download, install and build directories without editing the script. FS#9657 by Eric Shattow.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19725 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rwxr-xr-x | tools/rockboxdev.sh | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index 8ea6746e4c..4df253feb3 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -447,6 +447,7 @@ Kaspar Rothenfußer | |||
447 | Ryan Press | 447 | Ryan Press |
448 | Craig Elliott | 448 | Craig Elliott |
449 | Kenderes Tamas | 449 | Kenderes Tamas |
450 | Eric Shattow | ||
450 | 451 | ||
451 | 452 | ||
452 | The libmad team | 453 | The libmad team |
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index cd4030fabd..e3e9a0cbb4 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -8,17 +8,17 @@ set -e | |||
8 | 8 | ||
9 | # this is where this script will store downloaded files and check for already | 9 | # this is where this script will store downloaded files and check for already |
10 | # downloaded files | 10 | # downloaded files |
11 | dlwhere="/tmp/rbdev-dl" | 11 | dlwhere="${RBDEV_DOWNLOAD:-/tmp/rbdev-dl}" |
12 | 12 | ||
13 | # will append the target string to the prefix dir mentioned here | 13 | # will append the target string to the prefix dir mentioned here |
14 | # Note that the user running this script must be able to do make install in | 14 | # Note that the user running this script must be able to do make install in |
15 | # this given prefix directory. Also make sure that this given root dir | 15 | # this given prefix directory. Also make sure that this given root dir |
16 | # exists. | 16 | # exists. |
17 | prefix="/usr/local" | 17 | prefix="${RBDEV_PREFIX:-/usr/local}" |
18 | 18 | ||
19 | # This directory is used to extract all files and to build everything in. It | 19 | # This directory is used to extract all files and to build everything in. It |
20 | # must not exist before this script is invoked (as a security measure). | 20 | # must not exist before this script is invoked (as a security measure). |
21 | builddir="/tmp/rbdev-build" | 21 | builddir="${RBDEV_BUILD:-/tmp/rbdev-build}" |
22 | 22 | ||
23 | # This script needs to use GNU Make. On Linux systems, GNU Make is invoked | 23 | # This script needs to use GNU Make. On Linux systems, GNU Make is invoked |
24 | # by running the "make" command, on most BSD systems, GNU Make is invoked | 24 | # by running the "make" command, on most BSD systems, GNU Make is invoked |
@@ -117,9 +117,9 @@ else | |||
117 | echo "$dlwhere has been created to store downloads in" | 117 | echo "$dlwhere has been created to store downloads in" |
118 | fi | 118 | fi |
119 | 119 | ||
120 | echo "Download directory: $dlwhere (edit script to change dir)" | 120 | echo "Download directory: $dlwhere (set RBDEV_DOWNLOAD to change dir)" |
121 | echo "Install prefix: $prefix/[target] (edit script to change dir)" | 121 | echo "Install prefix: $prefix/[target] (set RBDEV_PREFIX to change dir)" |
122 | echo "Build dir: $builddir (edit script to change dir)" | 122 | echo "Build dir: $builddir (set RBDEV_BUILD to change dir)" |
123 | 123 | ||
124 | ########################################################################### | 124 | ########################################################################### |
125 | # Verify that we can write in the prefix dir, as otherwise we will hardly | 125 | # Verify that we can write in the prefix dir, as otherwise we will hardly |