diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/Makefile.am | 19 | ||||
| -rw-r--r-- | ld/README | 6 | ||||
| -rw-r--r-- | ld/configure.ac | 1 | ||||
| -rw-r--r-- | ld/gen-doc.texi | 2 | ||||
| -rw-r--r-- | ld/h8-doc.texi | 2 | ||||
| -rw-r--r-- | ld/ld.texi (renamed from ld/ld.texinfo) | 0 | ||||
| -rw-r--r-- | ld/ldint.texi (renamed from ld/ldint.texinfo) | 0 |
7 files changed, 11 insertions, 19 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index fcd9083..d86ad09 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign +AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign info-in-builddir ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd TEXINFO_TEX = ../texinfo/texinfo.tex @@ -80,7 +80,7 @@ INCDIR = $(BASEDIR)/include # What version of the manual to build DOCVER = gen -# Options to extract the man page from ld.texinfo +# Options to extract the man page from ld.texi MANCONF = -Dman TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) @@ -135,9 +135,9 @@ CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's transform = s/^ld-new$$/$(installed_linker)/;@program_transform_name@ bin_PROGRAMS = ld-new -info_TEXINFOS = ld.texinfo +info_TEXINFOS = ld.texi ld_TEXINFOS = configdoc.texi -noinst_TEXINFOS = ldint.texinfo +noinst_TEXINFOS = ldint.texi man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ @@ -1928,9 +1928,9 @@ configdoc.texi: ${DOCVER}-doc.texi # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. -ld.1: $(srcdir)/ld.texinfo configdoc.texi +ld.1: $(srcdir)/ld.texi configdoc.texi touch $@ - -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texinfo > ld.pod + -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texi > ld.pod -($(POD2MAN) ld.pod | \ sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || \ @@ -1994,10 +1994,3 @@ distclean-local: rm -rf ldscripts MAINTAINERCLEANFILES += ld.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -if GENINSRC_NEVER -DISTCLEANFILES += ld.info -endif @@ -18,8 +18,8 @@ There are many features of the linker: * The linker supports a control language. -* There is a user manual (ld.texinfo), as well as the - beginnings of an internals manual (ldint.texinfo). +* There is a user manual (ld.texi), as well as the + beginnings of an internals manual (ldint.texi). Installation ============ @@ -37,7 +37,7 @@ directory (one directory above this one). Porting to a new target ======================= -See the ldint.texinfo manual. +See the ldint.texi manual. Reporting bugs etc =========================== diff --git a/ld/configure.ac b/ld/configure.ac index b14411e..d10c553 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([ld], BFD_VERSION) AC_CONFIG_SRCDIR(ldmain.c) diff --git a/ld/gen-doc.texi b/ld/gen-doc.texi index 28acc93..1b80ee6 100644 --- a/ld/gen-doc.texi +++ b/ld/gen-doc.texi @@ -1,5 +1,5 @@ @c Copyright (C) 2012-2018 Free Software Foundation, Inc. -@c For copying conditions, see the file ld.texinfo. +@c For copying conditions, see the file ld.texi. @c ------------------------------ CONFIGURATION VARS: @c 1. Inclusiveness of this manual diff --git a/ld/h8-doc.texi b/ld/h8-doc.texi index ee3fe6a..503eace 100644 --- a/ld/h8-doc.texi +++ b/ld/h8-doc.texi @@ -1,5 +1,5 @@ @c Copyright (C) 2012-2018 Free Software Foundation, Inc. -@c For copying conditions, see the file ld.texinfo. +@c For copying conditions, see the file ld.texi. @c ------------------------------ CONFIGURATION VARS: @c 1. Inclusiveness of this manual diff --git a/ld/ld.texinfo b/ld/ld.texi index 40d79dd..40d79dd 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texi diff --git a/ld/ldint.texinfo b/ld/ldint.texi index 6df7c88..6df7c88 100644 --- a/ld/ldint.texinfo +++ b/ld/ldint.texi |