diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index d22dd1f..6ec557d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-06-21 Alan Modra <amodra@gmail.com> + + * doc/Makefile.am (AUTOMAKE_OPTIONS): Add "foreign". + * doc/Makefile.in: Regenerate. + 2018-06-20 Nick Clifton <nickc@redhat.com> PR 21458 diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 594226a..b3d4fa7 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex +AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign # What version of the manual you want; "all" includes everything CONFIG=all diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index ba9485c..b745b7e 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -380,7 +380,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zlibdir = @zlibdir@ zlibinc = @zlibinc@ -AUTOMAKE_OPTIONS = 1.8 info-in-builddir no-texinfo.tex +AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex foreign # What version of the manual you want; "all" includes everything CONFIG = all @@ -473,9 +473,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ |