Added getopt for binutils, fixed problem with host dependancies in

configure.template.

diff --git a/Makefile.in b/Makefile.in
index f93d37a2f2c753a2939e377f109ef076f4365738..a98a2d5a0bf9483048bab32543cbb58479e2301b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
 #
-# Last Mod Mon Apr 15 13:57:46 PDT 1991, by rich@sendai
+# Last Mod Tue Apr 16 12:57:52 PDT 1991, by rich@sendai
 #
 
 # $Id$
@@ -44,6 +44,13 @@ subdir_do: $(SUBDIRS) $(TARGETDIRS)
 all:
        $(MAKE) subdir_do DO=all
 
+stage1:
+       $(MAKE) subdir_do DO=stage1
+
+bootstrap:
+       $(MAKE) all
+       $(MAKE) stage1
+
 clean:
        rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
        $(MAKE) subdir_do DO=clean
@@ -96,7 +103,11 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
 
 #
 # $Log$
-# Revision 1.8  1991/04/15 23:43:45  rich
+# Revision 1.9  1991/04/17 01:34:36  rich
+# Added getopt for binutils, fixed problem with host dependancies in
+# configure.template.
+#
+# Revision 1.8  1991/04/15  23:43:45  rich
 # Now handles multiple hosts and targets.
 #
 # Revision 1.7  1991/04/13  13:06:16  tiemann

diff --git a/configure b/configure
index 9560d960cabf352a789d404310ce7b51b8f6ee87..59f2c5d3e48e9e65198490efe8f38a8f79527b01 100755 (executable)
--- a/configure
+++ b/configure
@@ -175,13 +175,10 @@ fi
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
-configdirs="bfd binutils ld gas gnulib gcc clib"
+configdirs="getopt bfd binutils ld gas gnulib1 gcc clib"
 srctrigger=README.configure
 srcname="gnu development package"
 
-# per-host:
-
-
 ## end of common part
 
 # are we rebuilding config itself?
@@ -209,11 +206,15 @@ if [ -n "${template}" ] ; then
                        exit 1
                fi
 
-               sed -e '/^# per\-target:/,$d' configure.in > configure.com
+               # split configure.in into common, per-host, and per-target parts
+               sed -e '/^# per\-host:/,$d' configure.in > configure.com
+               sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst
                sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
 
-               sed -e '/^#### configure.in common parts/  r configure.com' \
-                       -e '/^#### /  r configure.tgt' \
+               # and insert them
+               sed -e '/^#### configure.in common part/  r configure.com' \
+                       -e '/^#### configure.in per\-host part/  r configure.hst' \
+                       -e '/^#### configure.in per\-target part/  r configure.tgt' \
                        ${template} >> configure
 
                rm -f configure.com configure.tgt configure.hst
@@ -552,7 +553,11 @@ exit 0
 
 #
 # $Log$
-# Revision 1.7  1991/04/16 00:18:22  rich
+# Revision 1.8  1991/04/17 01:34:44  rich
+# Added getopt for binutils, fixed problem with host dependancies in
+# configure.template.
+#
+# Revision 1.6  1991/04/16  00:18:44  rich
 # Now handles multiple hosts and targets.
 #
 # Revision 1.5  1991/04/15  23:43:44  rich

diff --git a/configure.in b/configure.in
index 3e66b3a51e535db4ff17f7be0b3d3e3be5d5b796..3f94951365e0576ab9c4c556e0cba9a1eacc55c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
-configdirs="bfd binutils ld gas gnulib gcc clib"
+configdirs="getopt bfd binutils ld gas gnulib1 gcc clib"
 srctrigger=README.configure
 srcname="gnu development package"