Skip to content

R
riscv-gcc-1
Commit 17db6582 by Joseph Myers Committed by Joseph Myers
Options

configure.in: Don't define INSTALL_INFO. 

	* configure.in: Don't define INSTALL_INFO.
	* configure: Regenerate.
	* Makefile.in (INSTALL_INFO): Remove.
	(info): Depend on info files in source directory.
	(cpp.info, gcc.info, c-tree.info): Build info files in source
	directory.
	(distclean): Don't remove info files.
	(maintainer-clean): Remove info files from source directory.
	(install-normal): Depend on install-info.
	(install-info): Install info files from source directory, if they
	exist.
	* texinfo.tex: Update to version 2000-11-09.08 from ftp.gnu.org.

ch:
	* Make-lang.in (CHILL.info): Depend on info files in source
	directory.
	(ch/chill.info): Build info files in source directory.
	(CHILL.install-info): Install info files from source directory.

f:
	* Make-lang.in (f77.info): Depend on info files in source
	directory.
	(f/g77.info): Build info files in source directory; don't build
	them unless BUILD_INFO is "info".
	(f77.install-info): Install info files from source directory.

From-SVN: r38141
parent 25fa8bdc
Showing with 63 additions and 31 deletions
gcc/ChangeLog
2000-12-08 Joseph S. Myers <jsm28@cam.ac.uk>
* configure.in: Don't define INSTALL_INFO.
* configure: Regenerate.
* Makefile.in (INSTALL_INFO): Remove.
(info): Depend on info files in source directory.
(cpp.info, gcc.info, c-tree.info): Build info files in source
directory.
(distclean): Don't remove info files.
(maintainer-clean): Remove info files from source directory.
(install-normal): Depend on install-info.
(install-info): Install info files from source directory, if they
exist.
* texinfo.tex: Update to version 2000-11-09.08 from ftp.gnu.org.
2000-12-08 Alexandre Oliva <aoliva@redhat.com>
* lcm.c (optimize_mode_switching): Check whether an insn is a NOTE
......
gcc/Makefile.in
......@@ -466,7 +466,6 @@ INSTALL_HEADERS=install-headers
# Control whether Info documentation is built and installed.
BUILD_INFO = @BUILD_INFO@
INSTALL_INFO = @INSTALL_INFO@
# Additional directories of header files to run fixincludes on.
# These should be directories searched automatically by default
......@@ -2161,19 +2160,19 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
# Remake the info files.
doc: $(BUILD_INFO) gccbug
info: cpp.info gcc.info lang.info c-tree.info
info: $(srcdir)/cpp.info $(srcdir)/gcc.info lang.info $(srcdir)/c-tree.info
cpp.info: $(srcdir)/cpp.texi
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi
$(srcdir)/cpp.info: $(srcdir)/cpp.texi
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cpp.info cpp.texi
gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
$(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
$(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
$(srcdir)/tm.texi $(srcdir)/gcov.texi
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
c-tree.info: $(srcdir)/c-tree.texi
$(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o c-tree.info \
$(srcdir)/c-tree.texi
$(srcdir)/c-tree.info: $(srcdir)/c-tree.texi
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o c-tree.info \
c-tree.texi
dvi: gcc.dvi cpp.dvi lang.dvi
......@@ -2287,7 +2286,6 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
-rm -f intl/libintl.h libintl.h
-rm -f cxxmain.c splay-tree.c obstack.c alloca.c hashtab.c
-rm -f mklibgcc libgcc.map gccbug .gdbinit configargs.h
-rm -f c-tree.info c-tree.info-1 c-tree.info-2 c-tree.info-3
-rm -f gcov.pod
-rm -f fixinc/Makefile
-rmdir cp f java objc fixinc intl po 2>/dev/null
......@@ -2321,8 +2319,9 @@ maintainer-clean:
$(MAKE) INTL_DISTCLEAN= INTL_CLEAN= INTL_MOSTLYCLEAN= \
intl.maintainer-clean lang.maintainer-clean distclean
-rm -f c-parse.y c-parse.c c-parse.output TAGS
-rm -f cpp.info* cpp.??s cpp.*aux
-rm -f gcc.info* gcc.??s gcc.*aux
-rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*aux
-rm -f $(srcdir)/cpp.info* $(srcdir)/gcc.info* $(srcdir)/c-tree.info*
-rm -f $(srcdir)/gcov.1
#
# Entry points `install' and `uninstall'.
......@@ -2337,7 +2336,7 @@ install: $(INSTALL_TARGET) ; @true
# Install the driver last so that the window when things are
# broken is small.
install-normal: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
$(INSTALL_CPP) install-man $(INSTALL_INFO) intl.install \
$(INSTALL_CPP) install-man install-info intl.install \
lang.install-normal install-driver
# Do nothing while making gcc with a cross-compiler. The person who
......@@ -2494,13 +2493,18 @@ install-driver: xgcc$(exeext)
# to do the install.
install-info: doc installdirs lang.install-info
-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
for f in cpp.info* gcc.info*; do \
$(INSTALL_DATA) $$f $(infodir)/$$f; \
done
if [ -f $(srcdir)/gcc.info ]; then \
for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(infodir)/$$realfile; \
done; \
else true; fi
-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
if [ -f $(infodir)/dir ] ; then \
for f in cpp.info gcc.info; do \
install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
if [ -f $(infodir)/$$f ]; then \
install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
else true; fi \
done; \
else true; fi; \
else true; fi;
......
gcc/ch/ChangeLog
2000-12-08 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (CHILL.info): Depend on info files in source
directory.
(ch/chill.info): Build info files in source directory.
(CHILL.install-info): Install info files from source directory.
2000-12-07 Zack Weinberg <zack@wolery.stanford.edu>
* lex.c: Don't bother checking whether ISUPPER(c) before
......
gcc/ch/Make-lang.in
......@@ -108,10 +108,10 @@ CHILL.start.encap: chill
CHILL.rest.encap:
CHILL.dvi: chill.dvi
CHILL.info: ch/chill.info
CHILL.info: $(srcdir)/ch/chill.info
ch/chill.info: $(srcdir)/ch/chill.texi
$(MAKEINFO) -I$(srcdir)/ch -o ch/chill.info $(srcdir)/ch/chill.texi
$(srcdir)/ch/chill.info: $(srcdir)/ch/chill.texi
cd $(srcdir)/ch && $(MAKEINFO) -o chill.info chill.texi
chill.dvi: $(srcdir)/ch/chill.texi $(srcdir)/extend.texi $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi $(srcdir)/tm.texi
cd ch ; \
......@@ -145,7 +145,7 @@ CHILL.install-common:
# Don't delete $(infodir)/ch.info* unless there's actually new
# docs to install (in case LANGUAGES didn't contain chill earlier).
CHILL.install-info:
-for i in ch/chill.info*; do \
-cd $(srcdir)/ch; for i in chill.info*; do \
rm -f $(infodir)/chill.info*; \
realfile=`echo $$i | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$i $(infodir)/$$realfile; \
......@@ -169,7 +169,7 @@ CHILL.distclean:
CHILL.extraclean:
CHILL.maintainer-clean:
-rm -f ch/TAGS
-rm -f ch/chill.info* ch/chill.dvi ch/chill.??s ch/chill.*aux
-rm -f $(srcdir)/ch/chill.info* ch/chill.dvi ch/chill.??s ch/chill.*aux
# Delete locally created file.
-rm -f ch/hash.h
#
......
gcc/configure.in
......@@ -462,12 +462,10 @@ fi
if test $gcc_cv_prog_makeinfo_modern = no; then
AC_MSG_WARN([
*** Makeinfo is missing or too old.
*** Info documentation will not be built or installed.])
*** Info documentation will not be built.])
BUILD_INFO=
INSTALL_INFO=
else
BUILD_INFO=info AC_SUBST(BUILD_INFO)
INSTALL_INFO=install-info AC_SUBST(INSTALL_INFO)
fi
# How about lex?
......
gcc/f/ChangeLog
2000-12-08 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (f77.info): Depend on info files in source
directory.
(f/g77.info): Build info files in source directory; don't build
them unless BUILD_INFO is "info".
(f77.install-info): Install info files from source directory.
2000-12-07 Zack Weinberg <zack@wolery.stanford.edu>
* Make-lang.in: Link f/fini with safe-ctype.o.
......
gcc/f/Make-lang.in
......@@ -159,11 +159,11 @@ f77.all.cross: g77-cross$(exeext)
f77.start.encap: g77$(exeext)
f77.rest.encap:
f77.info: f/g77.info
f77.info: $(srcdir)/f/g77.info
f77.dvi: f/g77.dvi
# g77 documentation.
f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
$(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
$(srcdir)/f/ffe.texi \
$(srcdir)/f/g77install.texi $(srcdir)/f/news.texi \
$(srcdir)/f/intdoc.texi $(srcdir)/f/root.texi
......@@ -171,9 +171,9 @@ f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
*[fF]77*) touch lang-f77;; \
*) rm -f lang-f77;; \
esac
if [ -f lang-f77 ]; then \
if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(srcdir)/f/g77.info-*; \
$(MAKEINFO) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \
cd $(srcdir)/f && $(MAKEINFO) -o g77.info g77.texi; \
else true; fi
f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
......@@ -298,9 +298,9 @@ f77.install-info: f77.info installdirs
*[fF]77*) touch $(libsubdir)/lang-f77.info;; \
*) rm -f $(libsubdir)/lang-f77.info;; \
esac
if [ -f $(libsubdir)/lang-f77.info -a -f f/g77.info ] ; then \
if [ -f $(libsubdir)/lang-f77.info -a -f $(srcdir)/f/g77.info ] ; then \
rm -f $(infodir)/g77.info*; \
for f in f/g77.info*; do \
for f in $(srcdir)/f/g77.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(infodir)/$$realfile; \
done; \
......
gcc/texinfo.tex
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment