+forcesubdirs -> +subdirs
This commit is contained in:
parent
807e8e4ece
commit
991643f592
1 changed files with 23 additions and 17 deletions
40
configure
vendored
40
configure
vendored
|
@ -73,9 +73,6 @@ do
|
|||
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
|
||||
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
|
||||
;;
|
||||
-forcesubdirs | +f*)
|
||||
forcesubdirs=${arg}
|
||||
;;
|
||||
-languages=* | +languages=* | +language=* | +languag=* \
|
||||
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
|
||||
| +l=*)
|
||||
|
@ -99,9 +96,12 @@ do
|
|||
# -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
|
||||
# srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
|
||||
# ;;
|
||||
-subdirs | +su*)
|
||||
subdirs=${arg}
|
||||
;;
|
||||
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)
|
||||
if [ -n "${targets}" ] ; then
|
||||
forcesubdirs="+forcesubdirs"
|
||||
subdirs="+subdirs"
|
||||
fi
|
||||
|
||||
newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
|
||||
|
@ -121,7 +121,7 @@ do
|
|||
;;
|
||||
*)
|
||||
if [ -n "${hosts}" ] ; then
|
||||
forcesubdirs="+forcesubdirs"
|
||||
subdirs="+subdirs"
|
||||
fi
|
||||
|
||||
newhosts="${hosts} ${arg}"
|
||||
|
@ -152,7 +152,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
|
|||
echo "Options: [defaults in brackets]" ;
|
||||
echo " +ansi configure w/ANSI library. [no ansi lib]" ;
|
||||
echo " +destdir=MYDIR configure for installation into MYDIR. [/usr/local]" ;
|
||||
echo " +forcesubdirs configure in subdirectories. [in source directories]" ;
|
||||
echo " +subdirs configure in subdirectories. [in source directories]" ;
|
||||
echo " +lang=LANG configure to build LANG. [gcc]" ;
|
||||
echo " +help print this message. [normal config]" ;
|
||||
echo " +gas configure the compilers for use with gas. [native as]" ;
|
||||
|
@ -163,7 +163,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
|
|||
echo " +template=TEM rebuild configure using TEM. [normal config]" ;
|
||||
echo ;
|
||||
echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
|
||||
echo "Asking for more than one \"+target\" implies \"+forcesubdirs\". Any other" ;
|
||||
echo "Asking for more than one \"+target\" implies \"+subdirs\". Any other" ;
|
||||
echo "options given will apply to all targets.") 1>&2
|
||||
|
||||
if [ -r config.status ] ; then
|
||||
|
@ -179,7 +179,7 @@ fi
|
|||
# script appropriate for this directory. For more information, check
|
||||
# any existing configure script.
|
||||
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb prms "
|
||||
configdirs="libiberty bfd binutils bison gcc readline ld gas gnulib ${clib} gdb make prms "
|
||||
srctrigger=README.configure
|
||||
srcname="gnu development package"
|
||||
|
||||
|
@ -321,7 +321,7 @@ for host in ${hosts} ; do
|
|||
targetsubdir=Target-${target}
|
||||
|
||||
if [ -n "${removing}" ] ; then
|
||||
if [ -n "${forcesubdirs}" ] ; then
|
||||
if [ -n "${subdirs}" ] ; then
|
||||
if [ -d "${hostsubdir}" ] ; then
|
||||
rm -rf ${hostsubdir}/${targetsubdir}
|
||||
|
||||
|
@ -335,7 +335,7 @@ for host in ${hosts} ; do
|
|||
rm -f ${Makefile} config.status ${links}
|
||||
fi
|
||||
else
|
||||
if [ -n "${forcesubdirs}" ] ; then
|
||||
if [ -n "${subdirs}" ] ; then
|
||||
# check for existing status before allowing forced subdirs.
|
||||
if [ -f ${Makefile} ] ; then
|
||||
echo "${Makefile} already exists in source directory. `pwd` not configured."
|
||||
|
@ -437,7 +437,7 @@ for host in ${hosts} ; do
|
|||
echo "host = ${host}" >> ${Makefile}
|
||||
echo "target = ${target}" >> ${Makefile}
|
||||
|
||||
if [ -n "${forcesubdirs}" ] ; then
|
||||
if [ -n "${subdirs}" ] ; then
|
||||
echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
|
||||
else
|
||||
echo "subdir =" >> ${Makefile}
|
||||
|
@ -516,7 +516,7 @@ for host in ${hosts} ; do
|
|||
done # for each target
|
||||
|
||||
# Now build a Makefile for this host.
|
||||
if [ -n "${forcesubdirs}" -a ! -n "${removing}" ] ; then
|
||||
if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
|
||||
cd ${hostsubdir}
|
||||
cat > GNUmakefile << E!O!F
|
||||
# Makefile generated by configure for host ${host}.
|
||||
|
@ -556,7 +556,7 @@ for configdir in ${configdirs} ; do
|
|||
if [ -n "${commons}" ] ; then
|
||||
if [ -d ${configdir} ] ; then
|
||||
(cd ${configdir} ;
|
||||
./configure ${commons} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
|
||||
./configure ${commons} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
else
|
||||
echo Warning: directory \"${configdir}\" is missing.
|
||||
|
@ -567,7 +567,7 @@ for configdir in ${configdirs} ; do
|
|||
for host in ${specifics} ; do
|
||||
echo Configuring target specific directory ${configdir}.${host}...
|
||||
(cd ${configdir}.${host} ;
|
||||
./configure ${host} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
|
||||
./configure ${host} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
done # for host in specifics
|
||||
fi # if there are any specifics
|
||||
|
@ -592,7 +592,7 @@ for configdir in ${configdirs} ; do
|
|||
if [ -n "${commons}" ] ; then
|
||||
if [ -d ${configdir} ] ; then
|
||||
(cd ${configdir} ;
|
||||
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
|
||||
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
|
||||
${commons} +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
else
|
||||
|
@ -604,7 +604,7 @@ for configdir in ${configdirs} ; do
|
|||
for target in ${specifics} ; do
|
||||
echo Configuring target specific directory ${configdir}.${target}...
|
||||
(cd ${configdir}.${target} ;
|
||||
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
|
||||
./configure ${hosts} ${verbose} ${subdirs} ${removing} \
|
||||
"+target=${target}" +destdir=${destdir}) \
|
||||
| sed 's/^/ /'
|
||||
done
|
||||
|
@ -616,7 +616,13 @@ exit 0
|
|||
|
||||
#
|
||||
# $Log$
|
||||
# Revision 1.24 1991/08/06 19:26:01 rich
|
||||
# Revision 1.26 1991/08/07 19:21:32 rich
|
||||
# +forcesubdirs -> +subdirs
|
||||
#
|
||||
# Revision 1.25 1991/08/07 07:05:30 rich
|
||||
# Added make.
|
||||
#
|
||||
# Revision 1.24 1991/08/06 19:26:01 rich
|
||||
# revised option parsing.
|
||||
#
|
||||
# Revision 1.23 1991/08/06 19:12:32 rich
|
||||
|
|
Loading…
Reference in a new issue