diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2000-07-09 05:41:21 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2000-07-09 05:41:21 +0000 |
| commit | 63ac3005ce93e195643a80fca2c051cbd08fc491 (patch) | |
| tree | 7c894beb76fd00aadf1d4bd9a55212d3d5d85513 | |
| parent | 546022221a0ddf4216735c8a6428f76c962cfe89 (diff) | |
| download | fsf-binutils-gdb-63ac3005ce93e195643a80fca2c051cbd08fc491.zip fsf-binutils-gdb-63ac3005ce93e195643a80fca2c051cbd08fc491.tar.gz fsf-binutils-gdb-63ac3005ce93e195643a80fca2c051cbd08fc491.tar.bz2 | |
* Makefile.in (install-info): Find files to install in either the build
or source directories (adapted from Makefile.am).
(From Chris Faylor.)
| -rw-r--r-- | gdb/doc/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/doc/Makefile.in | 23 |
2 files changed, 21 insertions, 7 deletions
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 1c6363f..edf92b7 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2000-07-08 Christopher Faylor <cgf@cygnus.com> + + * Makefile.in (install-info): Find files to install in either the + build or source directories (adapted from Makefile.am). + 2000-07-07 Nicholas Duffek <nsd@redhat.com> * stabs.texinfo: Fix spelling errors. diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index f4c7af8..d591f5a 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -62,6 +62,9 @@ GDBMI_DIR = ${gdbdir}/mi SET_TEXINPUTS = \ TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$(GDBMI_DIR):$$TEXINPUTS +# Files which should be generated via 'info' and installed by 'install-info' +INFO_DEPS = gdb.info gdbint.info stabs.info + # There may be alternate predefined collections of switches to configure # the GDB manual. Normally this is not done in synch with the software # config system, since this choice tends to be independent; most people @@ -108,7 +111,7 @@ SFILES_DOC = $(SFILES_LOCAL) $(GDBMI_DIR)/gdbmi.texinfo \ all install: -info: gdb.info gdbint.info stabs.info +info: $(INFO_DEPS) dvi: gdb.dvi gdbint.dvi stabs.dvi refcard.dvi ps: gdb.ps gdbint.ps stabs.ps refcard.ps html: gdb_toc.html gdbint_toc.html stabs_toc.html @@ -116,14 +119,20 @@ pdf: gdb.pdf gdbint.pdf stabs.pdf all-doc: info dvi ps # pdf diststuff: info -install-info: info +install-info: $(INFO_DEPS) $(SHELL) $(srcdir)/../../mkinstalldirs $(infodir) - (cd $(srcdir); \ - for i in *.info* ; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i ; \ - done) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ + if test -f $$d/$$ifile; then \ + echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ + else : ; fi; \ + done; \ + done @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - list='gdb.info gdbint.info stabs.info'; \ + list='$(INFO_DEPS)'; \ for file in $$list; do \ echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ install-info --info-dir=$(infodir) $(infodir)/$$file || :;\ |