public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb, gdbserver: Add missing install-dvi Makefile target
@ 2024-04-10 13:37 Christophe Lyon
  0 siblings, 0 replies; only message in thread
From: Christophe Lyon @ 2024-04-10 13:37 UTC (permalink / raw)
  To: gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=96c1bcb38bcb1fd1e861d1536ab4deecaaf2b7de

commit 96c1bcb38bcb1fd1e861d1536ab4deecaaf2b7de
Author: Christophe Lyon <christophe.lyon@linaro.org>
Date:   Thu Apr 4 21:51:17 2024 +0000

    gdb, gdbserver: Add missing install-dvi Makefile target
    
    For some reason install-dvi is missing although other targets of the
    same family are present. This looks like an oversight.
    
    This enables calling 'make install-dvi' from the top-level build
    directory.
    
    Fix what looks like another oversight: include 'pdf' in 'all-doc' in
    gdb/doc/Makefile.in.
    
    Approved-By: Luis Machado <luis.machado@arm.com>
    Tested-By: Luis Machado <luis.machado@arm.com>

Diff:
---
 gdb/Makefile.in                |  2 +-
 gdb/data-directory/Makefile.in |  2 +-
 gdb/doc/Makefile.in            | 19 +++++++++++++++++--
 gdb/testsuite/Makefile.in      |  1 +
 gdbserver/Makefile.in          |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e9a6247c38d..23894ea4a4d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2055,7 +2055,7 @@ check-headers:
 	done
 .PHONY: check-headers
 
-info install-info clean-info dvi pdf install-pdf html install-html: force
+info install-info clean-info dvi install-dvi pdf install-pdf html install-html: force
 	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 # Traditionally "install" depends on "all".  But it may be useful
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index 720b983ef6c..c0419df86b3 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -429,7 +429,7 @@ maintainer-clean realclean distclean: clean
 .PHONY: install-info install-pdf install-html clean-info
 check installcheck:
 info dvi pdf html:
-install-info install-pdf install-html:
+install-info install-dvi install-pdf install-html:
 clean-info:
 
 # GNU Make has an annoying habit of putting *all* the Makefile variables
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 04f9dbd27f0..8007f6373d4 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -24,6 +24,7 @@ prefix = @prefix@
 infodir = @infodir@
 datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 pdfdir = @pdfdir@
 htmldir = @htmldir@
 mandir = @mandir@
@@ -87,6 +88,8 @@ SET_TEXINPUTS = \
 # Files which should be generated via 'info' and installed by 'install-info'
 INFO_DEPS = gdb.info stabs.info annotate.info
 
+# Files which should be generated via 'dvi' and installed by 'install-dvi'
+DVIFILES = gdb.dvi stabs.dvi refcard.dvi annotate.dvi
 # Files which should be generated via 'pdf' and installed by 'install-pdf'
 PDFFILES = gdb.pdf stabs.pdf refcard.pdf annotate.pdf
 # Files which should be generated via 'html' and installed by 'install-html'
@@ -191,7 +194,7 @@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
 all: info
 
 info: $(INFO_DEPS)
-dvi: gdb.dvi stabs.dvi refcard.dvi annotate.dvi
+dvi: $(DVIFILES)
 ps: gdb.ps stabs.ps refcard.ps annotate.ps
 html: $(HTMLFILES)
 pdf: $(PDFFILES)
@@ -233,7 +236,7 @@ Doxyfile-gdb-xref:	$(srcdir)/Doxyfile-gdb-xref.in
 Doxyfile-gdbserver:	$(srcdir)/Doxyfile-gdbserver.in
 	$(doxyedit) $(srcdir)/Doxyfile-gdbserver.in >Doxyfile-gdbserver
 
-all-doc: info dvi ps # pdf
+all-doc: info dvi ps pdf
 diststuff: info man
 	rm -f gdb-cfg.texi
 
@@ -293,6 +296,18 @@ install-html: $(HTMLFILES)
 	  fi; \
 	done
 
+dvi__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-dvi: $(DVIFILES)
+	@$(NORMAL_INSTALL)
+	test -z "$(dvidir)" || $(mkinstalldirs) "$(DESTDIR)$(dvidir)"
+	@list='$(DVIFILES)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(dvi__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
 pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 
 install-pdf: $(PDFFILES)
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index f6603daf7fd..f799f16c2bb 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -105,6 +105,7 @@ INFODIRS=doc
 info:
 install-info:
 dvi:
+install-dvi:
 pdf:
 install-pdf:
 html:
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 5180e7336cb..6148ccf9121 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -360,6 +360,7 @@ installcheck:
 check:
 info dvi pdf:
 install-info:
+install-dvi:
 install-pdf:
 html:
 install-html:

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-04-10 13:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-10 13:37 [binutils-gdb] gdb, gdbserver: Add missing install-dvi Makefile target Christophe Lyon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).