install-{html,pdf}

[Ralf Wildenhues]

* Tom Tromey wrote on Mon, Aug 17, 2009 at 06:16:30PM CEST:
> >>>>> "Ralf" == Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
> 
> Ralf>   ${docdir}/gcc/gcc.pdf
> [...]
> Ralf>   ${docdir}/gcj.pdf
> [...]
> 
> Ralf> Here, the location for at least gcj.pdf seems inconsistent
> Ralf> (but that issue existed before my patch series already).
> 
> If you want to fix the gcj.pdf install directory, consider your patch
> pre-approved.

Thanks!  Applied the following after testing.

Cheers,
Ralf

gcc/java/ChangeLog:
2009-08-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* Make-lang.in (java.install-pdf): Install gcj.pdf in
	$(pdfdir)/gcc, alongside the other manuals.

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 094e5e1..ff330fd 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -197,12 +197,12 @@ java.install-info: $(DESTDIR)$(infodir)/gcj.info
 
 java.install-pdf: $(JAVA_PDFFILES)
 	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
+	test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)/gcc"
 	@list='$(JAVA_PDFFILES)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(pdf__strip_dir) \
-	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/gcc/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/gcc/$$f"; \
 	done
 
 #