aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in57
-rwxr-xr-xbfd/configure137
-rwxr-xr-xbinutils/configure137
-rw-r--r--config/mt-a29k13
-rwxr-xr-xconfigure137
-rw-r--r--configure.in2
-rwxr-xr-xgas/configure135
-rwxr-xr-xld/configure137
8 files changed, 434 insertions, 321 deletions
diff --git a/Makefile.in b/Makefile.in
index 88db71f..f179074 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,14 +1,14 @@
#
# Makefile for directory with subdirs to build.
#
-# Last Mod Wed Apr 10 12:24:44 PDT 1991, by rich@sendai
+# Last Mod Fri Apr 12 15:58:12 PDT 1991, by rich@sendai
#
srcdir = .
-subdir = Host-$(host)/Target-$(target)
+destdir = /usr/local
-CC = gcc -b$(target) # -B$(srcdir)/../gas/Host-$(host)/Target-$(target)/
-CFLAGS = -g -nostdinc -nostdlib -I- -I/usr/local/lib/gcc/$(target)/1.92/include -I$(srcdir) -I$(srcdir)/../include -I$(OSINCLUDE)
+#CC = gcc -b$(target) # -B$(srcdir)/../gas/Host-$(host)/Target-$(target)/
+#CFLAGS = -g -nostdinc -nostdlib -I- -I/usr/local/lib/gcc/$(target)/1.92/include -I$(srcdir) -I$(srcdir)/../include -I$(OSINCLUDE)
# These are roughly topologically sorted in order to make porting more
# streamlined.
@@ -17,57 +17,37 @@ SUBDIRS =
NONSUBDIRS =
SUBDIRS_INCLUDE = machine-dep
-TARGETLIB = libc.a
RANLIB = ranlib
-AR = ar cqv
+AR = ar
+AR_FLAGS = cqv
#### host and target specific makefile fragments come in here.
-
-all: $(TARGETLIB)
+###
subdir_do: $(SUBDIRS) $(TARGETDIRS)
for i in $(SUBDIRS); \
do \
if (cd $(srcdir)/$$i`if [ -d $(srcdir)/$$i.$(target) ] ; \
- then echo .$(target) ; fi`/$(subdir); \
- $(MAKE) \
- "OSLAYER=../$(OSLAYER)" \
- "TARGETLIB=../$(srcdir)/$(subdir)/$(TARGETLIB)" \
+ then echo .$(target) ; fi`$(subdir); \
+ $(MAKE) \
+ "destdir=$(destdir)" \
"AR=$(AR)" \
+ "AR_FLAGS=$(AR_FLAGS)" \
"RANLIB=$(RANLIB)" $(DO)) ; \
then true ; \
else exit 1 ; \
fi ;\
done
-$(TARGETLIB): remove-old-copy
- @$(MAKE) subdir_do "DO=all"
- $(RANLIB) $(TARGETLIB)
-
-remove-old-copy: FORCE
- rm -f $(TARGETLIB)
-
-oldlibc.a: $(SUBDIRS) FORCE
- @$(MAKE) subdir_do DO=all
- rm -rf TEMP
- mkdir TEMP
-# Extract files from all subdirs, making sure that none overwrites others.
- cd TEMP; for i in $(SUBDIRS); do\
- ar x ../$$i/library.a;\
- chmod a-w *;\
- done;
-# Be sure if interrupted, no libc.a exists.
- rm -f libc.new
- cd TEMP; ar cq ../libc.new *
- ranlib libc.new
- mv libc.new libc.a
- rm -rf TEMP
+all:
+ $(MAKE) subdir_do DO=all
clean:
rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
$(MAKE) subdir_do DO=clean
-install: all install_include install_crt install_gnulib install_lib
+install:
+ $(MAKE) subdir_do DO=install
# When installing include files, be sure that machine-dependent
# files override machine-independent files.
@@ -108,11 +88,14 @@ FORCE:
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
(cd $(srcdir) ; \
- ./configure `if [ "$(srcdir)" != "." ] ; then echo +f; fi` -host=$(host) $(target))
+ ./configure +norecurse `if [ "$(srcdir)" != "." ] ; then echo +f; fi` +host=$(host) $(target))
#
# $Log$
-# Revision 1.3 1991/04/11 02:41:53 rich
+# Revision 1.4 1991/04/13 02:11:09 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:53 rich
# Cut 2 config. Subdirs.
#
#
diff --git a/bfd/configure b/bfd/configure
index d0b1680..c97770f 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -50,30 +50,35 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment.
ansi=
+destdir=
hostsubdir=
norecurse=
removing=
srcdir=
+srctrigger=
target=
targetsubdir=
template=
for arg in $*;
do
- case $arg in
+ case ${arg} in
-ansi | +ansi)
ansi=true
;;
+ -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
+ destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+ ;;
-forcesubdirs | +f*)
forcesubdirs=${arg}
;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
- host=`echo $arg | sed 's/[+-]h[a-z]*=//'`
+ host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
- languages="$languages `echo $arg | sed 's/[+-]l[a-z]*=//'`"
+ languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
gas=yes
@@ -85,29 +90,29 @@ do
norecurse=true
;;
-rm | +rm)
- removing=$arg
+ removing=${arg}
;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
- srcdir=`echo $arg | sed 's/[+-]s[a-z]*=//'`
+ srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
;;
-template=* | +template=*)
- template=`echo $arg | sed 's/[+-]template=//'`
+ template=`echo ${arg} | sed 's/[+-]template=//'`
;;
*)
# Allow configure HOST TARGET
- if [ x$host = x ] ; then host=$target ; fi
- target=$arg
+ if [ -z "${host}" ] ; then host=${target} ; fi
+ target=${arg}
;;
esac
done
# process host and target only if not rebuilding configure itself or removing.
-if [ -z "$template" -a -z "$removing" ]
+if [ -z "${template}" -a -z "${removing}" ]
then
# Complain if an arg is missing
- if [ -z "$target" ]
+ if [ -z "${target}" ]
then
- echo "Usage: $progname [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
+ echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
echo -n "Where HOST and TARGET are something like "
echo "\`vax', \`sun3', \`encore', etc."
if [ -r config.status ]
@@ -119,9 +124,9 @@ then
fi
# Default other arg
-if [ -z "$host" ]
+if [ -z "${host}" ]
then
- host=$target
+ host=${target}
fi
#### configure.in files come in here.
@@ -137,9 +142,9 @@ links=
### end of configure.in
# are we rebuilding config itself?
-if [ -n "$template" ]
+if [ -n "${template}" ]
then
- if [ ! -r $template ]
+ if [ ! -r ${template} ]
then
echo "Can't find template ${template}."
exit 1
@@ -154,21 +159,22 @@ then
if [ -r configure.in ]
then
- sed -e "/^####/ r configure.in" $template >> configure
+ sed -e "/^####/ r configure.in" ${template} >> configure
else
- cat $template >> configure
+ echo Warning: no configure.in in `pwd`
+ cat ${template} >> configure
fi
chmod a+x configure
rm configure.old
echo Rebuilt configure in `pwd`
- if [ x$norecurse = x ]
+ if [ -z "${norecurse}" ]
then
- while [ -n "$configdirs" ]
+ while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
then
@@ -193,6 +199,13 @@ then
exit 0
fi
+# some sanity checks on configure.in
+if [ -z "${srctrigger}" ]
+then
+ echo srctrigger not set in configure.in. `pwd` not configured.
+ exit 1
+fi
+
# Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host}
targetsubdir=Target-${target}
@@ -208,10 +221,10 @@ then
rm -rf ${hostsubdir}
fi
else
- rm -f .gdbinit Makefile config.status $links
+ rm -f .gdbinit Makefile config.status ${links}
fi
else
- if [ -n "$forcesubdirs" ]
+ if [ -n "${forcesubdirs}" ]
then
# check for existing status before allowing forced subdirs.
if [ -f Makefile ]
@@ -220,11 +233,11 @@ else
exit 1
fi
- if [ ! -d $hostsubdir ] ; then mkdir $hostsubdir ; fi
- cd $hostsubdir
+ if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
+ cd ${hostsubdir}
- if [ ! -d $targetsubdir ] ; then mkdir $targetsubdir ; fi
- cd $targetsubdir
+ if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+ cd ${targetsubdir}
srcdir=../..
else
@@ -237,61 +250,61 @@ else
fi
# Find the source files, if location was not specified.
- if [ x$srcdir = x ]
+ if [ -z "${srcdir}" ]
then
srcdirdefaulted=1
srcdir=.
- if [ ! -r ${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
then
srcdir=..
fi
fi
- if [ ! -r ${srcdir}/${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
then
- if [ -z "$srcdirdefaulted" ]
+ if [ -z "${srcdirdefaulted}" ]
then
- echo "$progname: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else
- echo "$progname: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi
exit 1
fi
# Set up the list of links to be made.
- # $links is the list of link names, and $files is the list of names to link to.
+ # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links.
- while [ -n "$files" ]
+ while [ -n "${files}" ]
do
# set file to car of files, files to cdr of files
- set $files; file=$1; shift; files=$*
- set $links; link=$1; shift; links=$*
+ set ${files}; file=$1; shift; files=$*
+ set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ]
then
- echo "$progname: cannot create a link \"${link}\"," 1>&2
- echo "since the file \"$file\" does not exist." 1>&2
+ echo "${progname}: cannot create a link \"${link}\"," 1>&2
+ echo "since the file \"${file}\" does not exist." 1>&2
exit 1
fi
- $remove -f $link
+ ${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
- $symbolic_link ${srcdir}/$file $link 2>/dev/null || $hard_link ${srcdir}/$file $link
+ ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
- if [ ! -r $link ]
+ if [ ! -r ${link} ]
then
- echo "$progname: unable to link \"$link\" to \"${srcdir}/$file\"." 1>&2
+ echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
fi
- echo "Linked \"$link\" to \"${srcdir}/${file}\"."
+ echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
- case $srcdir in
+ case ${srcdir} in
.)
;;
*)
@@ -310,7 +323,7 @@ else
# template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
- if [ x$host != x$target ]
+ if [ "${host}" != "${target}" ]
then
echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile
@@ -319,8 +332,8 @@ else
fi
# set target, host, VPATH
- echo "host = $host" >> Makefile
- echo "target = $target" >> Makefile
+ echo "host = ${host}" >> Makefile
+ echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ]
then
@@ -339,22 +352,31 @@ else
host_var_file=hmake-${host}
target_var_file=tmake-${target}
- # Conditionalize the makefile for this machine.
+ # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # set srcdir
sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
mv Makefile.tem Makefile
+ # set destdir
+ if [ -n "${destdir}" ]
+ then
+ sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
+ mv Makefile.tem Makefile
+ fi
+
# Remove all formfeeds, since some Makes get confused by them.
sed "s/ //" Makefile >> Makefile.tem
mv Makefile.tem Makefile
@@ -387,13 +409,13 @@ else
echo "Created \"Makefile\""${andusing}.
- if [ x$host = x$target ]
+ if [ "${host}" = "${target}" ]
then
- echo "Links are now set up for use with a $target." \
+ echo "Links are now set up for use with a ${target}." \
> config.status
# | tee ${srcdir}/config.status
else
- echo "Links are now set up for host $host and target $target." \
+ echo "Links are now set up for host ${host} and target ${target}." \
> config.status
# | tee ${srcdir}/config.status
fi
@@ -404,12 +426,12 @@ fi
# If there are subdirectories, then recurse.
-if [ -n "$norecurse" ] ; then exit 0 ; fi
+if [ -n "${norecurse}" ] ; then exit 0 ; fi
-while [ -n "$configdirs" ]
+while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
# check for target override
targetspecificdir=${configdir}.${target}
@@ -428,8 +450,11 @@ exit 0
#
# $Log$
-# Revision 1.3 1991/04/10 22:56:14 rich
-# Cut 2. Subdirs.
+# Revision 1.4 1991/04/13 02:12:45 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:54 rich
+# Cut 2 config. Subdirs.
#
#
#
diff --git a/binutils/configure b/binutils/configure
index c0473fa..d86580a 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -50,30 +50,35 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment.
ansi=
+destdir=
hostsubdir=
norecurse=
removing=
srcdir=
+srctrigger=
target=
targetsubdir=
template=
for arg in $*;
do
- case $arg in
+ case ${arg} in
-ansi | +ansi)
ansi=true
;;
+ -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
+ destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+ ;;
-forcesubdirs | +f*)
forcesubdirs=${arg}
;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
- host=`echo $arg | sed 's/[+-]h[a-z]*=//'`
+ host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
- languages="$languages `echo $arg | sed 's/[+-]l[a-z]*=//'`"
+ languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
gas=yes
@@ -85,29 +90,29 @@ do
norecurse=true
;;
-rm | +rm)
- removing=$arg
+ removing=${arg}
;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
- srcdir=`echo $arg | sed 's/[+-]s[a-z]*=//'`
+ srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
;;
-template=* | +template=*)
- template=`echo $arg | sed 's/[+-]template=//'`
+ template=`echo ${arg} | sed 's/[+-]template=//'`
;;
*)
# Allow configure HOST TARGET
- if [ x$host = x ] ; then host=$target ; fi
- target=$arg
+ if [ -z "${host}" ] ; then host=${target} ; fi
+ target=${arg}
;;
esac
done
# process host and target only if not rebuilding configure itself or removing.
-if [ -z "$template" -a -z "$removing" ]
+if [ -z "${template}" -a -z "${removing}" ]
then
# Complain if an arg is missing
- if [ -z "$target" ]
+ if [ -z "${target}" ]
then
- echo "Usage: $progname [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
+ echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
echo -n "Where HOST and TARGET are something like "
echo "\`vax', \`sun3', \`encore', etc."
if [ -r config.status ]
@@ -119,9 +124,9 @@ then
fi
# Default other arg
-if [ -z "$host" ]
+if [ -z "${host}" ]
then
- host=$target
+ host=${target}
fi
#### configure.in files come in here.
@@ -138,9 +143,9 @@ links=
### end of configure.in
# are we rebuilding config itself?
-if [ -n "$template" ]
+if [ -n "${template}" ]
then
- if [ ! -r $template ]
+ if [ ! -r ${template} ]
then
echo "Can't find template ${template}."
exit 1
@@ -155,21 +160,22 @@ then
if [ -r configure.in ]
then
- sed -e "/^####/ r configure.in" $template >> configure
+ sed -e "/^####/ r configure.in" ${template} >> configure
else
- cat $template >> configure
+ echo Warning: no configure.in in `pwd`
+ cat ${template} >> configure
fi
chmod a+x configure
rm configure.old
echo Rebuilt configure in `pwd`
- if [ x$norecurse = x ]
+ if [ -z "${norecurse}" ]
then
- while [ -n "$configdirs" ]
+ while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
then
@@ -194,6 +200,13 @@ then
exit 0
fi
+# some sanity checks on configure.in
+if [ -z "${srctrigger}" ]
+then
+ echo srctrigger not set in configure.in. `pwd` not configured.
+ exit 1
+fi
+
# Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host}
targetsubdir=Target-${target}
@@ -209,10 +222,10 @@ then
rm -rf ${hostsubdir}
fi
else
- rm -f .gdbinit Makefile config.status $links
+ rm -f .gdbinit Makefile config.status ${links}
fi
else
- if [ -n "$forcesubdirs" ]
+ if [ -n "${forcesubdirs}" ]
then
# check for existing status before allowing forced subdirs.
if [ -f Makefile ]
@@ -221,11 +234,11 @@ else
exit 1
fi
- if [ ! -d $hostsubdir ] ; then mkdir $hostsubdir ; fi
- cd $hostsubdir
+ if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
+ cd ${hostsubdir}
- if [ ! -d $targetsubdir ] ; then mkdir $targetsubdir ; fi
- cd $targetsubdir
+ if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+ cd ${targetsubdir}
srcdir=../..
else
@@ -238,61 +251,61 @@ else
fi
# Find the source files, if location was not specified.
- if [ x$srcdir = x ]
+ if [ -z "${srcdir}" ]
then
srcdirdefaulted=1
srcdir=.
- if [ ! -r ${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
then
srcdir=..
fi
fi
- if [ ! -r ${srcdir}/${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
then
- if [ -z "$srcdirdefaulted" ]
+ if [ -z "${srcdirdefaulted}" ]
then
- echo "$progname: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else
- echo "$progname: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi
exit 1
fi
# Set up the list of links to be made.
- # $links is the list of link names, and $files is the list of names to link to.
+ # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links.
- while [ -n "$files" ]
+ while [ -n "${files}" ]
do
# set file to car of files, files to cdr of files
- set $files; file=$1; shift; files=$*
- set $links; link=$1; shift; links=$*
+ set ${files}; file=$1; shift; files=$*
+ set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ]
then
- echo "$progname: cannot create a link \"${link}\"," 1>&2
- echo "since the file \"$file\" does not exist." 1>&2
+ echo "${progname}: cannot create a link \"${link}\"," 1>&2
+ echo "since the file \"${file}\" does not exist." 1>&2
exit 1
fi
- $remove -f $link
+ ${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
- $symbolic_link ${srcdir}/$file $link 2>/dev/null || $hard_link ${srcdir}/$file $link
+ ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
- if [ ! -r $link ]
+ if [ ! -r ${link} ]
then
- echo "$progname: unable to link \"$link\" to \"${srcdir}/$file\"." 1>&2
+ echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
fi
- echo "Linked \"$link\" to \"${srcdir}/${file}\"."
+ echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
- case $srcdir in
+ case ${srcdir} in
.)
;;
*)
@@ -311,7 +324,7 @@ else
# template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
- if [ x$host != x$target ]
+ if [ "${host}" != "${target}" ]
then
echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile
@@ -320,8 +333,8 @@ else
fi
# set target, host, VPATH
- echo "host = $host" >> Makefile
- echo "target = $target" >> Makefile
+ echo "host = ${host}" >> Makefile
+ echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ]
then
@@ -340,22 +353,31 @@ else
host_var_file=hmake-${host}
target_var_file=tmake-${target}
- # Conditionalize the makefile for this machine.
+ # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # set srcdir
sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
mv Makefile.tem Makefile
+ # set destdir
+ if [ -n "${destdir}" ]
+ then
+ sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
+ mv Makefile.tem Makefile
+ fi
+
# Remove all formfeeds, since some Makes get confused by them.
sed "s/ //" Makefile >> Makefile.tem
mv Makefile.tem Makefile
@@ -388,13 +410,13 @@ else
echo "Created \"Makefile\""${andusing}.
- if [ x$host = x$target ]
+ if [ "${host}" = "${target}" ]
then
- echo "Links are now set up for use with a $target." \
+ echo "Links are now set up for use with a ${target}." \
> config.status
# | tee ${srcdir}/config.status
else
- echo "Links are now set up for host $host and target $target." \
+ echo "Links are now set up for host ${host} and target ${target}." \
> config.status
# | tee ${srcdir}/config.status
fi
@@ -405,12 +427,12 @@ fi
# If there are subdirectories, then recurse.
-if [ -n "$norecurse" ] ; then exit 0 ; fi
+if [ -n "${norecurse}" ] ; then exit 0 ; fi
-while [ -n "$configdirs" ]
+while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
# check for target override
targetspecificdir=${configdir}.${target}
@@ -429,8 +451,11 @@ exit 0
#
# $Log$
-# Revision 1.3 1991/04/10 22:56:51 rich
-# Cut 2. Subdirs.
+# Revision 1.4 1991/04/13 02:12:20 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:54 rich
+# Cut 2 config. Subdirs.
#
#
#
diff --git a/config/mt-a29k b/config/mt-a29k
index 9a6ed1d..43fae2b 100644
--- a/config/mt-a29k
+++ b/config/mt-a29k
@@ -1,4 +1,9 @@
-BINUTILSDIR=/u1/rich/work/binutils.$(target)/Host-$(host)/Target-$(target)
-AR=$(BINUTILSDIR)/ar cqv
-RANLIB=$(BINUTILSDIR)/ranlib
-OSLAYER = clib/os-layer.$(target)
+AR = ar-a29k
+AR_FLAGS = qs
+RANLIB = echo
+
+# This is a hack. By declaring subdirs using "SUBDIRS=" rather than
+# with a space, config won't reset this. This is a hack to override
+# the set of directories to be made.
+SUBDIRS= binutils gas gcc clib
+
diff --git a/configure b/configure
index bfa3fcc..7247ecd 100755
--- a/configure
+++ b/configure
@@ -50,30 +50,35 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment.
ansi=
+destdir=
hostsubdir=
norecurse=
removing=
srcdir=
+srctrigger=
target=
targetsubdir=
template=
for arg in $*;
do
- case $arg in
+ case ${arg} in
-ansi | +ansi)
ansi=true
;;
+ -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
+ destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+ ;;
-forcesubdirs | +f*)
forcesubdirs=${arg}
;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
- host=`echo $arg | sed 's/[+-]h[a-z]*=//'`
+ host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
- languages="$languages `echo $arg | sed 's/[+-]l[a-z]*=//'`"
+ languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
gas=yes
@@ -85,29 +90,29 @@ do
norecurse=true
;;
-rm | +rm)
- removing=$arg
+ removing=${arg}
;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
- srcdir=`echo $arg | sed 's/[+-]s[a-z]*=//'`
+ srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
;;
-template=* | +template=*)
- template=`echo $arg | sed 's/[+-]template=//'`
+ template=`echo ${arg} | sed 's/[+-]template=//'`
;;
*)
# Allow configure HOST TARGET
- if [ x$host = x ] ; then host=$target ; fi
- target=$arg
+ if [ -z "${host}" ] ; then host=${target} ; fi
+ target=${arg}
;;
esac
done
# process host and target only if not rebuilding configure itself or removing.
-if [ -z "$template" -a -z "$removing" ]
+if [ -z "${template}" -a -z "${removing}" ]
then
# Complain if an arg is missing
- if [ -z "$target" ]
+ if [ -z "${target}" ]
then
- echo "Usage: $progname [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
+ echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
echo -n "Where HOST and TARGET are something like "
echo "\`vax', \`sun3', \`encore', etc."
if [ -r config.status ]
@@ -119,9 +124,9 @@ then
fi
# Default other arg
-if [ -z "$host" ]
+if [ -z "${host}" ]
then
- host=$target
+ host=${target}
fi
#### configure.in files come in here.
@@ -130,15 +135,15 @@ fi
# script appropriate for this directory. For more information, check
# any existing configure script.
-configdirs="bfd binutils ld gas gcc"
+configdirs="bfd binutils ld gas gcc clib"
srctrigger=README.configure
srcname="gnu development package"
### end of configure.in
# are we rebuilding config itself?
-if [ -n "$template" ]
+if [ -n "${template}" ]
then
- if [ ! -r $template ]
+ if [ ! -r ${template} ]
then
echo "Can't find template ${template}."
exit 1
@@ -153,21 +158,22 @@ then
if [ -r configure.in ]
then
- sed -e "/^####/ r configure.in" $template >> configure
+ sed -e "/^####/ r configure.in" ${template} >> configure
else
- cat $template >> configure
+ echo Warning: no configure.in in `pwd`
+ cat ${template} >> configure
fi
chmod a+x configure
rm configure.old
echo Rebuilt configure in `pwd`
- if [ x$norecurse = x ]
+ if [ -z "${norecurse}" ]
then
- while [ -n "$configdirs" ]
+ while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
then
@@ -192,6 +198,13 @@ then
exit 0
fi
+# some sanity checks on configure.in
+if [ -z "${srctrigger}" ]
+then
+ echo srctrigger not set in configure.in. `pwd` not configured.
+ exit 1
+fi
+
# Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host}
targetsubdir=Target-${target}
@@ -207,10 +220,10 @@ then
rm -rf ${hostsubdir}
fi
else
- rm -f .gdbinit Makefile config.status $links
+ rm -f .gdbinit Makefile config.status ${links}
fi
else
- if [ -n "$forcesubdirs" ]
+ if [ -n "${forcesubdirs}" ]
then
# check for existing status before allowing forced subdirs.
if [ -f Makefile ]
@@ -219,11 +232,11 @@ else
exit 1
fi
- if [ ! -d $hostsubdir ] ; then mkdir $hostsubdir ; fi
- cd $hostsubdir
+ if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
+ cd ${hostsubdir}
- if [ ! -d $targetsubdir ] ; then mkdir $targetsubdir ; fi
- cd $targetsubdir
+ if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+ cd ${targetsubdir}
srcdir=../..
else
@@ -236,61 +249,61 @@ else
fi
# Find the source files, if location was not specified.
- if [ x$srcdir = x ]
+ if [ -z "${srcdir}" ]
then
srcdirdefaulted=1
srcdir=.
- if [ ! -r ${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
then
srcdir=..
fi
fi
- if [ ! -r ${srcdir}/${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
then
- if [ -z "$srcdirdefaulted" ]
+ if [ -z "${srcdirdefaulted}" ]
then
- echo "$progname: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else
- echo "$progname: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi
exit 1
fi
# Set up the list of links to be made.
- # $links is the list of link names, and $files is the list of names to link to.
+ # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links.
- while [ -n "$files" ]
+ while [ -n "${files}" ]
do
# set file to car of files, files to cdr of files
- set $files; file=$1; shift; files=$*
- set $links; link=$1; shift; links=$*
+ set ${files}; file=$1; shift; files=$*
+ set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ]
then
- echo "$progname: cannot create a link \"${link}\"," 1>&2
- echo "since the file \"$file\" does not exist." 1>&2
+ echo "${progname}: cannot create a link \"${link}\"," 1>&2
+ echo "since the file \"${file}\" does not exist." 1>&2
exit 1
fi
- $remove -f $link
+ ${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
- $symbolic_link ${srcdir}/$file $link 2>/dev/null || $hard_link ${srcdir}/$file $link
+ ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
- if [ ! -r $link ]
+ if [ ! -r ${link} ]
then
- echo "$progname: unable to link \"$link\" to \"${srcdir}/$file\"." 1>&2
+ echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
fi
- echo "Linked \"$link\" to \"${srcdir}/${file}\"."
+ echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
- case $srcdir in
+ case ${srcdir} in
.)
;;
*)
@@ -309,7 +322,7 @@ else
# template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
- if [ x$host != x$target ]
+ if [ "${host}" != "${target}" ]
then
echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile
@@ -318,8 +331,8 @@ else
fi
# set target, host, VPATH
- echo "host = $host" >> Makefile
- echo "target = $target" >> Makefile
+ echo "host = ${host}" >> Makefile
+ echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ]
then
@@ -338,22 +351,31 @@ else
host_var_file=hmake-${host}
target_var_file=tmake-${target}
- # Conditionalize the makefile for this machine.
+ # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # set srcdir
sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
mv Makefile.tem Makefile
+ # set destdir
+ if [ -n "${destdir}" ]
+ then
+ sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
+ mv Makefile.tem Makefile
+ fi
+
# Remove all formfeeds, since some Makes get confused by them.
sed "s/ //" Makefile >> Makefile.tem
mv Makefile.tem Makefile
@@ -386,13 +408,13 @@ else
echo "Created \"Makefile\""${andusing}.
- if [ x$host = x$target ]
+ if [ "${host}" = "${target}" ]
then
- echo "Links are now set up for use with a $target." \
+ echo "Links are now set up for use with a ${target}." \
> config.status
# | tee ${srcdir}/config.status
else
- echo "Links are now set up for host $host and target $target." \
+ echo "Links are now set up for host ${host} and target ${target}." \
> config.status
# | tee ${srcdir}/config.status
fi
@@ -403,12 +425,12 @@ fi
# If there are subdirectories, then recurse.
-if [ -n "$norecurse" ] ; then exit 0 ; fi
+if [ -n "${norecurse}" ] ; then exit 0 ; fi
-while [ -n "$configdirs" ]
+while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
# check for target override
targetspecificdir=${configdir}.${target}
@@ -427,7 +449,10 @@ exit 0
#
# $Log$
-# Revision 1.3 1991/04/11 02:41:51 rich
+# Revision 1.4 1991/04/13 02:11:07 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:54 rich
# Cut 2 config. Subdirs.
#
#
diff --git a/configure.in b/configure.in
index a9cbec9..e3182a9 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,6 @@
# script appropriate for this directory. For more information, check
# any existing configure script.
-configdirs="bfd binutils ld gas gcc"
+configdirs="bfd binutils ld gas gcc clib"
srctrigger=README.configure
srcname="gnu development package"
diff --git a/gas/configure b/gas/configure
index 8bc619c..4940daa 100755
--- a/gas/configure
+++ b/gas/configure
@@ -50,30 +50,35 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment.
ansi=
+destdir=
hostsubdir=
norecurse=
removing=
srcdir=
+srctrigger=
target=
targetsubdir=
template=
for arg in $*;
do
- case $arg in
+ case ${arg} in
-ansi | +ansi)
ansi=true
;;
+ -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
+ destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+ ;;
-forcesubdirs | +f*)
forcesubdirs=${arg}
;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
- host=`echo $arg | sed 's/[+-]h[a-z]*=//'`
+ host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
- languages="$languages `echo $arg | sed 's/[+-]l[a-z]*=//'`"
+ languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
gas=yes
@@ -85,29 +90,29 @@ do
norecurse=true
;;
-rm | +rm)
- removing=$arg
+ removing=${arg}
;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
- srcdir=`echo $arg | sed 's/[+-]s[a-z]*=//'`
+ srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
;;
-template=* | +template=*)
- template=`echo $arg | sed 's/[+-]template=//'`
+ template=`echo ${arg} | sed 's/[+-]template=//'`
;;
*)
# Allow configure HOST TARGET
- if [ x$host = x ] ; then host=$target ; fi
- target=$arg
+ if [ -z "${host}" ] ; then host=${target} ; fi
+ target=${arg}
;;
esac
done
# process host and target only if not rebuilding configure itself or removing.
-if [ -z "$template" -a -z "$removing" ]
+if [ -z "${template}" -a -z "${removing}" ]
then
# Complain if an arg is missing
- if [ -z "$target" ]
+ if [ -z "${target}" ]
then
- echo "Usage: $progname [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
+ echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
echo -n "Where HOST and TARGET are something like "
echo "\`vax', \`sun3', \`encore', etc."
if [ -r config.status ]
@@ -119,9 +124,9 @@ then
fi
# Default other arg
-if [ -z "$host" ]
+if [ -z "${host}" ]
then
- host=$target
+ host=${target}
fi
#### configure.in files come in here.
@@ -190,9 +195,9 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
### end of configure.in
# are we rebuilding config itself?
-if [ -n "$template" ]
+if [ -n "${template}" ]
then
- if [ ! -r $template ]
+ if [ ! -r ${template} ]
then
echo "Can't find template ${template}."
exit 1
@@ -207,21 +212,22 @@ then
if [ -r configure.in ]
then
- sed -e "/^####/ r configure.in" $template >> configure
+ sed -e "/^####/ r configure.in" ${template} >> configure
else
- cat $template >> configure
+ echo Warning: no configure.in in `pwd`
+ cat ${template} >> configure
fi
chmod a+x configure
rm configure.old
echo Rebuilt configure in `pwd`
- if [ x$norecurse = x ]
+ if [ -z "${norecurse}" ]
then
- while [ -n "$configdirs" ]
+ while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
then
@@ -246,6 +252,13 @@ then
exit 0
fi
+# some sanity checks on configure.in
+if [ -z "${srctrigger}" ]
+then
+ echo srctrigger not set in configure.in. `pwd` not configured.
+ exit 1
+fi
+
# Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host}
targetsubdir=Target-${target}
@@ -261,10 +274,10 @@ then
rm -rf ${hostsubdir}
fi
else
- rm -f .gdbinit Makefile config.status $links
+ rm -f .gdbinit Makefile config.status ${links}
fi
else
- if [ -n "$forcesubdirs" ]
+ if [ -n "${forcesubdirs}" ]
then
# check for existing status before allowing forced subdirs.
if [ -f Makefile ]
@@ -273,11 +286,11 @@ else
exit 1
fi
- if [ ! -d $hostsubdir ] ; then mkdir $hostsubdir ; fi
- cd $hostsubdir
+ if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
+ cd ${hostsubdir}
- if [ ! -d $targetsubdir ] ; then mkdir $targetsubdir ; fi
- cd $targetsubdir
+ if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+ cd ${targetsubdir}
srcdir=../..
else
@@ -290,61 +303,61 @@ else
fi
# Find the source files, if location was not specified.
- if [ x$srcdir = x ]
+ if [ -z "${srcdir}" ]
then
srcdirdefaulted=1
srcdir=.
- if [ ! -r ${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
then
srcdir=..
fi
fi
- if [ ! -r ${srcdir}/${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
then
- if [ -z "$srcdirdefaulted" ]
+ if [ -z "${srcdirdefaulted}" ]
then
- echo "$progname: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else
- echo "$progname: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi
exit 1
fi
# Set up the list of links to be made.
- # $links is the list of link names, and $files is the list of names to link to.
+ # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links.
- while [ -n "$files" ]
+ while [ -n "${files}" ]
do
# set file to car of files, files to cdr of files
- set $files; file=$1; shift; files=$*
- set $links; link=$1; shift; links=$*
+ set ${files}; file=$1; shift; files=$*
+ set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ]
then
- echo "$progname: cannot create a link \"${link}\"," 1>&2
- echo "since the file \"$file\" does not exist." 1>&2
+ echo "${progname}: cannot create a link \"${link}\"," 1>&2
+ echo "since the file \"${file}\" does not exist." 1>&2
exit 1
fi
- $remove -f $link
+ ${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
- $symbolic_link ${srcdir}/$file $link 2>/dev/null || $hard_link ${srcdir}/$file $link
+ ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
- if [ ! -r $link ]
+ if [ ! -r ${link} ]
then
- echo "$progname: unable to link \"$link\" to \"${srcdir}/$file\"." 1>&2
+ echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
fi
- echo "Linked \"$link\" to \"${srcdir}/${file}\"."
+ echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
- case $srcdir in
+ case ${srcdir} in
.)
;;
*)
@@ -363,7 +376,7 @@ else
# template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
- if [ x$host != x$target ]
+ if [ "${host}" != "${target}" ]
then
echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile
@@ -372,8 +385,8 @@ else
fi
# set target, host, VPATH
- echo "host = $host" >> Makefile
- echo "target = $target" >> Makefile
+ echo "host = ${host}" >> Makefile
+ echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ]
then
@@ -392,22 +405,31 @@ else
host_var_file=hmake-${host}
target_var_file=tmake-${target}
- # Conditionalize the makefile for this machine.
+ # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # set srcdir
sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
mv Makefile.tem Makefile
+ # set destdir
+ if [ -n "${destdir}" ]
+ then
+ sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
+ mv Makefile.tem Makefile
+ fi
+
# Remove all formfeeds, since some Makes get confused by them.
sed "s/ //" Makefile >> Makefile.tem
mv Makefile.tem Makefile
@@ -440,13 +462,13 @@ else
echo "Created \"Makefile\""${andusing}.
- if [ x$host = x$target ]
+ if [ "${host}" = "${target}" ]
then
- echo "Links are now set up for use with a $target." \
+ echo "Links are now set up for use with a ${target}." \
> config.status
# | tee ${srcdir}/config.status
else
- echo "Links are now set up for host $host and target $target." \
+ echo "Links are now set up for host ${host} and target ${target}." \
> config.status
# | tee ${srcdir}/config.status
fi
@@ -457,12 +479,12 @@ fi
# If there are subdirectories, then recurse.
-if [ -n "$norecurse" ] ; then exit 0 ; fi
+if [ -n "${norecurse}" ] ; then exit 0 ; fi
-while [ -n "$configdirs" ]
+while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
# check for target override
targetspecificdir=${configdir}.${target}
@@ -481,7 +503,10 @@ exit 0
#
# $Log$
-# Revision 1.3 1991/04/11 02:24:29 rich
+# Revision 1.4 1991/04/13 02:10:29 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:54 rich
# Cut 2 config. Subdirs.
#
#
diff --git a/ld/configure b/ld/configure
index 103106c..a7adce0 100755
--- a/ld/configure
+++ b/ld/configure
@@ -50,30 +50,35 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment.
ansi=
+destdir=
hostsubdir=
norecurse=
removing=
srcdir=
+srctrigger=
target=
targetsubdir=
template=
for arg in $*;
do
- case $arg in
+ case ${arg} in
-ansi | +ansi)
ansi=true
;;
+ -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
+ destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+ ;;
-forcesubdirs | +f*)
forcesubdirs=${arg}
;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
- host=`echo $arg | sed 's/[+-]h[a-z]*=//'`
+ host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*)
- languages="$languages `echo $arg | sed 's/[+-]l[a-z]*=//'`"
+ languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
;;
-gas | +gas | +ga | +g)
gas=yes
@@ -85,29 +90,29 @@ do
norecurse=true
;;
-rm | +rm)
- removing=$arg
+ removing=${arg}
;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
- srcdir=`echo $arg | sed 's/[+-]s[a-z]*=//'`
+ srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
;;
-template=* | +template=*)
- template=`echo $arg | sed 's/[+-]template=//'`
+ template=`echo ${arg} | sed 's/[+-]template=//'`
;;
*)
# Allow configure HOST TARGET
- if [ x$host = x ] ; then host=$target ; fi
- target=$arg
+ if [ -z "${host}" ] ; then host=${target} ; fi
+ target=${arg}
;;
esac
done
# process host and target only if not rebuilding configure itself or removing.
-if [ -z "$template" -a -z "$removing" ]
+if [ -z "${template}" -a -z "${removing}" ]
then
# Complain if an arg is missing
- if [ -z "$target" ]
+ if [ -z "${target}" ]
then
- echo "Usage: $progname [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
+ echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET"
echo -n "Where HOST and TARGET are something like "
echo "\`vax', \`sun3', \`encore', etc."
if [ -r config.status ]
@@ -119,9 +124,9 @@ then
fi
# Default other arg
-if [ -z "$host" ]
+if [ -z "${host}" ]
then
- host=$target
+ host=${target}
fi
#### configure.in files come in here.
@@ -138,9 +143,9 @@ links=
### end of configure.in
# are we rebuilding config itself?
-if [ -n "$template" ]
+if [ -n "${template}" ]
then
- if [ ! -r $template ]
+ if [ ! -r ${template} ]
then
echo "Can't find template ${template}."
exit 1
@@ -155,21 +160,22 @@ then
if [ -r configure.in ]
then
- sed -e "/^####/ r configure.in" $template >> configure
+ sed -e "/^####/ r configure.in" ${template} >> configure
else
- cat $template >> configure
+ echo Warning: no configure.in in `pwd`
+ cat ${template} >> configure
fi
chmod a+x configure
rm configure.old
echo Rebuilt configure in `pwd`
- if [ x$norecurse = x ]
+ if [ -z "${norecurse}" ]
then
- while [ -n "$configdirs" ]
+ while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ]
then
@@ -194,6 +200,13 @@ then
exit 0
fi
+# some sanity checks on configure.in
+if [ -z "${srctrigger}" ]
+then
+ echo srctrigger not set in configure.in. `pwd` not configured.
+ exit 1
+fi
+
# Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host}
targetsubdir=Target-${target}
@@ -209,10 +222,10 @@ then
rm -rf ${hostsubdir}
fi
else
- rm -f .gdbinit Makefile config.status $links
+ rm -f .gdbinit Makefile config.status ${links}
fi
else
- if [ -n "$forcesubdirs" ]
+ if [ -n "${forcesubdirs}" ]
then
# check for existing status before allowing forced subdirs.
if [ -f Makefile ]
@@ -221,11 +234,11 @@ else
exit 1
fi
- if [ ! -d $hostsubdir ] ; then mkdir $hostsubdir ; fi
- cd $hostsubdir
+ if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
+ cd ${hostsubdir}
- if [ ! -d $targetsubdir ] ; then mkdir $targetsubdir ; fi
- cd $targetsubdir
+ if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+ cd ${targetsubdir}
srcdir=../..
else
@@ -238,61 +251,61 @@ else
fi
# Find the source files, if location was not specified.
- if [ x$srcdir = x ]
+ if [ -z "${srcdir}" ]
then
srcdirdefaulted=1
srcdir=.
- if [ ! -r ${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srctrigger} ]
then
srcdir=..
fi
fi
- if [ ! -r ${srcdir}/${srctrigger} ]
+ if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ]
then
- if [ -z "$srcdirdefaulted" ]
+ if [ -z "${srcdirdefaulted}" ]
then
- echo "$progname: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else
- echo "$progname: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
+ echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi
exit 1
fi
# Set up the list of links to be made.
- # $links is the list of link names, and $files is the list of names to link to.
+ # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links.
- while [ -n "$files" ]
+ while [ -n "${files}" ]
do
# set file to car of files, files to cdr of files
- set $files; file=$1; shift; files=$*
- set $links; link=$1; shift; links=$*
+ set ${files}; file=$1; shift; files=$*
+ set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ]
then
- echo "$progname: cannot create a link \"${link}\"," 1>&2
- echo "since the file \"$file\" does not exist." 1>&2
+ echo "${progname}: cannot create a link \"${link}\"," 1>&2
+ echo "since the file \"${file}\" does not exist." 1>&2
exit 1
fi
- $remove -f $link
+ ${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
- $symbolic_link ${srcdir}/$file $link 2>/dev/null || $hard_link ${srcdir}/$file $link
+ ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
- if [ ! -r $link ]
+ if [ ! -r ${link} ]
then
- echo "$progname: unable to link \"$link\" to \"${srcdir}/$file\"." 1>&2
+ echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1
fi
- echo "Linked \"$link\" to \"${srcdir}/${file}\"."
+ echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
- case $srcdir in
+ case ${srcdir} in
.)
;;
*)
@@ -311,7 +324,7 @@ else
# template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
- if [ x$host != x$target ]
+ if [ "${host}" != "${target}" ]
then
echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile
@@ -320,8 +333,8 @@ else
fi
# set target, host, VPATH
- echo "host = $host" >> Makefile
- echo "target = $target" >> Makefile
+ echo "host = ${host}" >> Makefile
+ echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ]
then
@@ -340,22 +353,31 @@ else
host_var_file=hmake-${host}
target_var_file=tmake-${target}
- # Conditionalize the makefile for this machine.
+ # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ]
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
+ # set srcdir
sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
mv Makefile.tem Makefile
+ # set destdir
+ if [ -n "${destdir}" ]
+ then
+ sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
+ mv Makefile.tem Makefile
+ fi
+
# Remove all formfeeds, since some Makes get confused by them.
sed "s/ //" Makefile >> Makefile.tem
mv Makefile.tem Makefile
@@ -388,13 +410,13 @@ else
echo "Created \"Makefile\""${andusing}.
- if [ x$host = x$target ]
+ if [ "${host}" = "${target}" ]
then
- echo "Links are now set up for use with a $target." \
+ echo "Links are now set up for use with a ${target}." \
> config.status
# | tee ${srcdir}/config.status
else
- echo "Links are now set up for host $host and target $target." \
+ echo "Links are now set up for host ${host} and target ${target}." \
> config.status
# | tee ${srcdir}/config.status
fi
@@ -405,12 +427,12 @@ fi
# If there are subdirectories, then recurse.
-if [ -n "$norecurse" ] ; then exit 0 ; fi
+if [ -n "${norecurse}" ] ; then exit 0 ; fi
-while [ -n "$configdirs" ]
+while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs
- set $configdirs; configdir=$1; shift; configdirs=$*
+ set ${configdirs}; configdir=$1; shift; configdirs=$*
# check for target override
targetspecificdir=${configdir}.${target}
@@ -429,8 +451,11 @@ exit 0
#
# $Log$
-# Revision 1.3 1991/04/10 22:55:43 rich
-# Cut 2. Subdirs.
+# Revision 1.4 1991/04/13 02:07:08 rich
+# Config cut 3. We now almost install a29k.
+#
+# Revision 1.3 1991/04/11 02:41:54 rich
+# Cut 2 config. Subdirs.
#
#
#