changes required to get gcc with the new g77 0.5.20 compiled smoothly

on OpenBSD

3 files changed, 10 insertions, 10 deletions

diff --git a/gnu/usr.bin/gcc/config/alpha/xm-alpha.h b/gnu/usr.bin/gcc/config/alpha/xm-alpha.h
index ed925b20f17..6967756f84a 100644
--- a/gnu/usr.bin/gcc/config/alpha/xm-alpha.h
+++ b/gnu/usr.bin/gcc/config/alpha/xm-alpha.h
@@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA.  */
 #if !defined(__GNUC__) && !defined(_WIN32)
 #include <alloca.h>
 #else
-#ifndef __alpha__
+#if !defined( __alpha__) || defined(__OpenBSD__)
 extern void *alloca ();
 #endif
 #endif
diff --git a/gnu/usr.bin/gcc/f/Make-lang.in b/gnu/usr.bin/gcc/f/Make-lang.in
index 021d0e28762..58d2ad00751 100644
--- a/gnu/usr.bin/gcc/f/Make-lang.in
+++ b/gnu/usr.bin/gcc/f/Make-lang.in
@@ -327,7 +327,7 @@ f77.dvi: $(srcdir)/f/g77.dvi
 #               g77 documentation rules will follow then commented out
 # g77 documentation.
 $(build_infodir)/f/g77.info: f/g77.texi f/bugs.texi f/install.texi f/news.texi
-	$(MAKEINFO) -I$(srcdir)/f $(srcdir)/f/g77.texi \
+	$(MAKEINFO) -P$(srcdir)/f $(srcdir)/f/g77.texi \
 	  -o $(build_infodir)/f/g77.info
 
 # XXX OpenBSD - what to do with dvi rules ...?
@@ -362,9 +362,9 @@ $(srcdir)/f/g77.dvi: f/g77.texi f/bugs.texi f/install.texi f/news.texi
 #	  --no-validate news0.texi -o NEWS
 
 $(srcdir)/f/runtime/configure: $(srcdir)/f/runtime/configure.in 
-	cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt
+	cd f/runtime && $(MAKE) srcdir=$(srcdir)/f/runtime -f $(srcdir)/f/runtime/Makefile.in rebuilt
 $(srcdir)/f/runtime/libU77/configure: $(srcdir)/f/runtime/libU77/configure.in
-	cd f/runtime && $(MAKE) srcdir=../../$(srcdir)/f/runtime -f ../../$(srcdir)/f/runtime/Makefile.in rebuilt
+	cd f/runtime && $(MAKE) srcdir=$(srcdir)/f/runtime -f $(srcdir)/f/runtime/Makefile.in rebuilt
 
 f77.rebuilt: $(srcdir)/f/g77.info $(srcdir)/f/BUGS $(srcdir)/f/INSTALL \
   $(srcdir)/f/NEWS $(srcdir)/f/runtime/configure \
@@ -508,11 +508,11 @@ f77.uninstall:
 f77.mostlyclean:
 	-rm -f f/*$(objext)
 	-rm -f f/fini f/f771 f/stamp-str f/str-*.h f/str-*.j f/intdoc
-	-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in mostlyclean
+	-cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in mostlyclean
 f77.clean:
-	-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in clean
+	-cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in clean
 f77.distclean:
-	-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in distclean
+	-cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in distclean
 	-rm -f f/Makefile
 # like gcc's extraclean, which does clean f/ for us, but not f/gbe,
 # f/runtime, f/runtime/libF77, f/runtime/libI77, and f/runtime/libU77,
@@ -530,7 +530,7 @@ f77.extraclean: f77.distclean
 	-rm -f f/*/*/*lose f/*/*/*.s f/*/*/*.s[0-9] f/*/*/*.i
 # realclean is the pre-2.7.0 name for maintainer-clean
 f77.maintainer-clean f77.realclean: f77.distclean
-	-cd f/runtime; $(MAKE) -f ../../$(srcdir)/f/runtime/Makefile.in maintainer-clean
+	-cd f/runtime; $(MAKE) -f $(srcdir)/f/runtime/Makefile.in maintainer-clean
 	-$(MAKE) f77.maintainer-clean
 	-rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/INSTALL f/NEWS f/intdoc.texi
 
diff --git a/gnu/usr.bin/gcc/f/runtime/Makefile.in b/gnu/usr.bin/gcc/f/runtime/Makefile.in
index 3aae19baa64..ad0d2ab9043 100644
--- a/gnu/usr.bin/gcc/f/runtime/Makefile.in
+++ b/gnu/usr.bin/gcc/f/runtime/Makefile.in
@@ -185,9 +185,9 @@ libu77: libU77/Makefile
 	fi
 
 ${srcdir}/configure: ${srcdir}/configure.in
-	rm -f config.cache && cd ${srcdir} && autoconf && rm -f config.cache
+	rm -f config.cache && cd ${srcdir}
 ${srcdir}/libU77/configure: ${srcdir}/libU77/configure.in
-	rm -f libU77/config.cache && cd ${srcdir}/libU77 && autoconf && rm -f config.cache
+	rm -f libU77/config.cache && cd ${srcdir}/libU77
 #../include/f2c.h libI77/Makefile libF77/Makefile libU77/Makefile Makefile: ${srcdir}/Makefile.in \
 #  config.status libU77/config.status
 #	$(FLAGS_TO_PASS) CONFIG_SITE=/dev/null $(SHELL) config.status