diff options
author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-15 14:12:48 -0500 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-02-15 21:03:36 +0100 |
commit | 74fc3efb60ed7844c8f7dbd0bd66f666e611dcfb (patch) | |
tree | 2f084497baa05843a7ceb0ce172d8e37a4daadf7 /tools/configure | |
parent | 0f34c51522ba7cfe957aca8439dc82c7bb6920c7 (diff) | |
download | rockbox-74fc3efb60ed7844c8f7dbd0bd66f666e611dcfb.tar.gz rockbox-74fc3efb60ed7844c8f7dbd0bd66f666e611dcfb.zip |
Prevent configure from being run in the root of the tree, fix a typo in the configure script
Change-Id: I61205c2f00edbdcd726ca455a67c810fafe3ca92
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure index 2dd1bf3e12..13cd5995b2 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1287,7 +1287,7 @@ fi | |||
1287 | echo Using temporary directory $tmpdir | 1287 | echo Using temporary directory $tmpdir |
1288 | 1288 | ||
1289 | if test -r "configure"; then | 1289 | if test -r "configure"; then |
1290 | # this is a check for a configure script in the current directory, it there | 1290 | # this is a check for a configure script in the current directory, if there |
1291 | # is one, try to figure out if it is this one! | 1291 | # is one, try to figure out if it is this one! |
1292 | 1292 | ||
1293 | if { grep "^# Jukebox" configure >/dev/null 2>&1 ; } then | 1293 | if { grep "^# Jukebox" configure >/dev/null 2>&1 ; } then |
@@ -1304,6 +1304,23 @@ if test -r "configure"; then | |||
1304 | fi | 1304 | fi |
1305 | fi | 1305 | fi |
1306 | 1306 | ||
1307 | if test -r "tools/configure"; then | ||
1308 | # this is a check for a configure script in the tools/ directory, if there | ||
1309 | # is one, try to figure out if it is this one! | ||
1310 | |||
1311 | if { grep "^# Jukebox" tools/configure >/dev/null 2>&1 ; } then | ||
1312 | echo "WEEEEEEEEP. Don't run this configure script in the root of the tree." | ||
1313 | echo "It will only cause you pain and grief. Instead do this:" | ||
1314 | echo "" | ||
1315 | echo " mkdir build-dir" | ||
1316 | echo " cd build-dir" | ||
1317 | echo " ../tools/configure" | ||
1318 | echo "" | ||
1319 | echo "Much happiness will arise from this. Enjoy" | ||
1320 | exit 5 | ||
1321 | fi | ||
1322 | fi | ||
1323 | |||
1307 | # get our current directory | 1324 | # get our current directory |
1308 | pwd=`pwd`; | 1325 | pwd=`pwd`; |
1309 | 1326 | ||