Re: [RFA] Revised doc/Makefile.in patch

[Chris Faylor <cgf at cygnus dot com>]

Is there any way that we can make a decision on this patch?  I'd like to
make a gdb release for Windows based entirely on CVS.

My patch may not be perfect but it should be marginally better than the
previous behavior.

cgf

On Sat, Jul 01, 2000 at 12:21:40PM -0400, Chris Faylor wrote:
>
>	* Makefile.in (install-info): Find files to install via VPATH since
>	info files can be in either the source or the build directory.
>
>Index: doc/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/gdb/doc/Makefile.in,v
>retrieving revision 1.10
>diff -u -p -r1.10 Makefile.in
>--- Makefile.in	2000/06/25 08:12:30	1.10
>+++ Makefile.in	2000/07/01 16:09:55
>@@ -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_FILES = 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
> 
> all install:
> 
>-info: gdb.info gdbint.info stabs.info
>+info: $(INFO_FILES)
> 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,15 +119,15 @@ pdf: gdb.pdf gdbint.pdf stabs.pdf
> all-doc: info dvi ps # pdf
> diststuff: info
> 
>-install-info: info
>+install-info: $(INFO_FILES)
> 	$(SHELL) $(srcdir)/../../mkinstalldirs $(infodir)
>-	(cd $(srcdir); \
>-	for i in *.info* ; do \
>-		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
>-	done)
>+	for j in $?; do \
>+		for i in $$j*; do \
>+			$(INSTALL_DATA) $$i $(infodir) ; \
>+		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'; \
>-	  for file in $$list; do \
>+	  for file in $(INFO_FILES); do \
> 	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
> 	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
> 	  done; \

-- 
cgf@cygnus.com                        Cygnus Solutions, a Red Hat company
http://sourceware.cygnus.com/         http://www.redhat.com/