merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 34e01a8d07a9090fe91b4d9e54e4e3233e7c9a59..6ac77d7cc174638ea1cb974d57057aac9a67234b 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
+
+       * Makefile.in: Add install-pdf target as copied from
+       automake v1.10 rules.
+       * testsuite/Makefile.in: Add dummy install-pdf target.
+
 2007-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
             Eric Botcazou  <ebotcazou@libertysurf.fr>
 

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 570d2e8ba15cd748c3fa5911194e5dc68e77e130..90686f00b15f897a69364c173a49939a1fc40847 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -245,7 +245,24 @@ info: libiberty.info info-subdir
 install-info: install-info-subdir
 clean-info: clean-info-subdir
 dvi: libiberty.dvi dvi-subdir
-pdf: libiberty.pdf pdf-subdir
+
+LIBIBERTY_PDFFILES = libiberty.pdf
+
+pdf: $(LIBIBERTY_PDFFILES) pdf-subdir
+
+.PHONY: install-pdf
+
+pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-pdf: $(LIBIBERTY_PDFFILES)
+       @$(NORMAL_INSTALL)
+       test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
+       @list='$(LIBIBERTY_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"; \
+       done
 
 # html, install-html targets
 HTMLS = libiberty.html

diff --git a/libiberty/testsuite/Makefile.in b/libiberty/testsuite/Makefile.in
index 6979d941aed7ceb2b1f1940624af22e56671ad49..56800a7a7ce001768b544614a8067122fc2f51ad 100644 (file)
--- a/libiberty/testsuite/Makefile.in
+++ b/libiberty/testsuite/Makefile.in
@@ -73,7 +73,8 @@ test-expandargv: $(srcdir)/test-expandargv.c ../libiberty.a
                $(srcdir)/test-expandargv.c ../libiberty.a
 
 # Standard (either GNU or Cygnus) rules we don't use.
-html install-html info install-info clean-info dvi pdf install etags tags installcheck:
+html install-html info install-info clean-info dvi pdf install-pdf \
+install etags tags installcheck:
 
 # The standard clean rules.
 mostlyclean: