This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[RFA] doc/Makefile.in patch stolen from Makefile.am
- To: Andrew Cagney <ac131313 at cygnus dot com>
- Subject: [RFA] doc/Makefile.in patch stolen from Makefile.am
- From: Chris Faylor <cgf at cygnus dot com>
- Date: Sat, 8 Jul 2000 01:35:54 -0400
- Cc: gdb-patches at sourceware dot cygnus dot com, Eli Zaretskii <eliz at is dot elta dot co dot il>
- References: <200006231835.OAA07083@fwr.landmark.com> <200006250818.EAA07995@indy.delorie.com> <20000630010635.A14862@cygnus.com> <200006300846.EAA14373@indy.delorie.com> <20000630101845.A5618@cygnus.com> <395DAF5C.602EC73F@cygnus.com> <20000701122140.B169 <39651ED5.E021F26C@cygnus.com>
On Fri, Jul 07, 2000 at 10:05:41AM +1000, Andrew Cagney wrote:
>Chris Faylor wrote:
>>
>> 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.
>
>Could I suggest stealing the install-info-am: target from
>src/bfd/doc/Makefile.in? (calling it install-info: of course :-).
Here it is. It was a lot easier than I thought it would be.
I should have just done this to begin with.
(Of course I like my patch better. :-})
cgf
Sat Jul 8 01:32:43 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in (install-info): Find files to install in either the build
or source directories (adapted from Makefile.am).
Index: 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/08 05:34:20
@@ -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
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 || :;\