diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2004-01-05 22:13:52 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2004-01-05 22:13:52 +0000 |
| commit | 44365859e37ba9666eb9553c898d8c34604e39ed (patch) | |
| tree | 8df6d502c432346291f785a62d4631e80b39bd32 | |
| parent | 82f8659922e112988a39b8419b8e7136034cc462 (diff) | |
| download | binutils-redhat-44365859e37ba9666eb9553c898d8c34604e39ed.tar.gz | |
* Makefile.am (install, install-info, RECURSIVE_TARGETS): Remove.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* doc/Makefile.am (install, install-info): Remove.
(install-data-local): A new hook for install-info.
(AUTOMAKE_OPTIONS): Require automake 1.8.
* doc/Makefile.in: Regenerate.
| -rw-r--r-- | gas/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/Makefile.am | 6 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 47d9dce404..7aea5c22d8 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2004-01-05 Maciej W. Rozycki <macro@ds2.pg.gda.pl> + + * Makefile.am (install, install-info, RECURSIVE_TARGETS): Remove. + * Makefile.in: Regenerate. + * aclocal.m4: Regenerate. + * doc/Makefile.am (install, install-info): Remove. + (install-data-local): A new hook for install-info. + (AUTOMAKE_OPTIONS): Require automake 1.8. + * doc/Makefile.in: Regenerate. + 2004-01-02 Nutan Singh <nutan@kpitcummins.com> * doc/c-sh.texi: Update description about floating point behavior diff --git a/gas/Makefile.am b/gas/Makefile.am index 0063f133e7..84b5dda1b1 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -456,12 +456,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -# We want install to imply install-info as per GNU standards, despite the -# cygnus option. -install: install-recursive install-info -install-info: install-info-recursive -RECURSIVE_TARGETS += install-info-recursive - # Note: GASP is now deprecated and has been removed. It is still # available in the CVS archive or older binutils releases if it is needed. noinst_PROGRAMS = as-new diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 0fdd756c4e..a9977f3170 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = 1.8 cygnus # What version of the manual you want; "all" includes everything CONFIG=all @@ -67,8 +67,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) # We want install to imply install-info as per GNU standards, despite the # cygnus option. -install: install-info -install-info: install-info-am +install-data-local: install-info # This one isn't ready for prime time yet. Not even a little bit. |