diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2006-06-02 23:08:12 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2006-06-02 23:08:12 +0000 |
| commit | bd01c3dd39df1cc696f3300991fd26e685ae1030 (patch) | |
| tree | 1c1ed69eb6b69d4fba2274ecf5a8418a9a656008 /binutils | |
| parent | 345c4484410b56ac1b1375775a41687a6c24633e (diff) | |
| download | binutils-redhat-bd01c3dd39df1cc696f3300991fd26e685ae1030.tar.gz | |
binutils:
* doc/Makefile.am (TEXI2DVI): Define.
* doc/Makefile.in: Regenerate.
gas:
* doc/Makefile.am (TEXI2DVI): Define.
* doc/Makefile.in: Regenerate.
* doc/c-arc.texi: Fix typo.
ld:
* Makefile.am (TEXI2DVI): Add -I $(top_srcdir)/../libiberty.
* Makefile.in: Regenerate.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/doc/Makefile.am | 1 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 17 |
3 files changed, 11 insertions, 12 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 7d8d632a1f..e6a3b3fcff 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Joseph S. Myers <joseph@codesourcery.com> + + * doc/Makefile.am (TEXI2DVI): Define. + * doc/Makefile.in: Regenerate. + 2006-05-31 Daniel Jacobowitz <dan@codesourcery.com> * Makefile.am: Replace INTLLIBS with LIBINTL everywhere. Add diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 4080826dd6..1d043e7d3f 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -35,6 +35,7 @@ binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI) rm -f config.texi diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index dbd7d6b7ff..333a1af8c5 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -64,11 +64,6 @@ PDFS = binutils.pdf PSS = binutils.ps HTMLS = binutils.html TEXINFOS = binutils.texi -TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ - echo $(top_srcdir)/../texinfo/util/texi2dvi; \ - else \ - echo texi2dvi; \ - fi` TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) @@ -241,6 +236,7 @@ info_TEXINFOS = binutils.texi binutils_TEXINFOS = config.texi binutils_TEXI = $(srcdir)/binutils.texi AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" +TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" MAINTAINERCLEANFILES = config.texi MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -370,13 +366,10 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f $(distdir)/$$relfile || \ - cp -p $$file $(distdir)/$$relfile; \ - else :; fi; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done |