Filter --srcdir= option before invoking builds/unix/configure.
This commit is contained in:
parent
20fb146351
commit
66d308edfd
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
Filter --srcdir= option before invoking builds/unix/configure.
|
||||||
|
|
||||||
|
* configure: When builds/unix/configure is invoked with --srcdir
|
||||||
|
option, the option should take "builds/unix" directory instead
|
||||||
|
of the top source directory. Thus configure in the top directory
|
||||||
|
should modify --srcdir= option when builds/unix/configure is
|
||||||
|
invoked.
|
||||||
|
|
||||||
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
Improve configure.raw for cross-building on exe-suffixed systems.
|
Improve configure.raw for cross-building on exe-suffixed systems.
|
||||||
|
|
|
@ -67,6 +67,17 @@ ft2_dir=`(dirname "$0") 2>/dev/null ||
|
||||||
abs_curr_dir=`pwd`
|
abs_curr_dir=`pwd`
|
||||||
abs_ft2_dir=`cd "$ft2_dir" && pwd`
|
abs_ft2_dir=`cd "$ft2_dir" && pwd`
|
||||||
|
|
||||||
|
# "--srcdir=" option can override abs_ft2_dir.
|
||||||
|
|
||||||
|
if test $# -gt 0; then
|
||||||
|
for x in "$@"; do
|
||||||
|
case x"$x" in
|
||||||
|
x--srcdir=*)
|
||||||
|
abs_ft2_dir=`echo $x | sed 's/^--srcdir=//'` ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
# build a dummy Makefile if we are not building in the source tree
|
# build a dummy Makefile if we are not building in the source tree
|
||||||
|
|
||||||
if test "$abs_curr_dir" != "$abs_ft2_dir"; then
|
if test "$abs_curr_dir" != "$abs_ft2_dir"; then
|
||||||
|
@ -96,7 +107,10 @@ CFG=
|
||||||
case $# in
|
case $# in
|
||||||
0) ;;
|
0) ;;
|
||||||
*) for x in "$@"; do
|
*) for x in "$@"; do
|
||||||
CFG="$CFG '$x'"
|
case x"$x" in
|
||||||
|
x--srcdir=* ) CFG="$CFG '$x'/builds/unix" ;;
|
||||||
|
*) CFG="$CFG '$x'" ;;
|
||||||
|
esac
|
||||||
done ;;
|
done ;;
|
||||||
esac
|
esac
|
||||||
CFG=$CFG $GNUMAKE setup unix
|
CFG=$CFG $GNUMAKE setup unix
|
||||||
|
|
Loading…
Reference in New Issue