Re: gdb-5.0/gdb/doc/Makefile.in patch -- is this patch really correct?

[Chris Faylor <cgf at cygnus dot com>]

On Sun, Jun 25, 2000 at 04:18:17AM -0400, Eli Zaretskii wrote:
>> From: markh@frazier.landmark.com
>> Date: Fri, 23 Jun 2000 14:35:24 -0400
>> 
>>    Here is a patch file to fix a bug in the 'install-info' target.  The
>> target does not work correctly if the debugger is being built in a
>> directory other than the source directory.
>
>Thanks, I committed this to the trunk.

I've just been bitten by this patch and I don't really understand it.

The .info files that should be installed come from the build directory
not from the source directory.  I don't see any .info* files in gdb/doc
at all.

I noticed this while producing a cygwin net release.  "make install-info"
complained about the lack of *.info* files to install.

Here are the contents of my build 'doc' directory:

GDBvn.texi     gdb-cfg.texi  gdb.info-11  gdb.info-3  gdb.info-7   gdbint.info-1  stabs.info-1
Makefile       gdb.info      gdb.info-12  gdb.info-4  gdb.info-8   gdbint.info-2  stabs.info-2
config.log     gdb.info-1    gdb.info-13  gdb.info-5  gdb.info-9   gdbint.info-3  stabs.info-3
config.status  gdb.info-10   gdb.info-2   gdb.info-6  gdbint.info  stabs.info     stabs.info-4

And this is the source directory:

CVS        Makefile.in       agentexpr.texi  configure     gdbgui.texinfo  lpsrc.sed    stabs.texinfo
ChangeLog  Makefile.in.orig  all-cfg.texi    configure.in  gdbint.texinfo  psrc.sed
LRS        a4rc.sed          annotate.texi   gdb.texinfo   libgdb.texinfo  refcard.tex

There are *.texinfo files here but no *.info files.

It seems to me that the previous code was correct and should have worked
whether you were building in the same directory as the source or not.

cgf

>> I think that the same bug
>> exists for the 'install-html' target, but I did not pursue this because
>> I did not find any .html files in the gdb distribution.
>
>No, the install-html target doesn't need this change, because the
>*.html files are not part of the distribution.  If someone wants to
>install them, they will have to be generated first, in which case they
>are created in the same directory where GDB is built.  Thus no need to
>chdir to $(srcdir) in that case.
>
>> 
>> diff -u2 Makefile.in.orig Makefile.in
>> --- Makefile.in.orig	Wed May 17 07:54:04 2000
>> +++ Makefile.in	Tue Jun 20 12:24:48 2000
>> @@ -115,7 +115,8 @@
>>  install-info: info
>>  	$(SHELL) $(srcdir)/../../mkinstalldirs $(infodir)
>> +	(cd $(srcdir); \
>>  	for i in *.info* ; do \
>>  		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
>> -	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'; \
>> 
>> -- 
>> ## Mark Harig
>> ## Landmark Systems, Reston, Virginia, USA
>> ## Email: mharig@landmark.com
>> 

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