diff options
| author | DJ Delorie <dj@redhat.com> | 2007-03-05 22:15:41 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2007-03-05 22:15:41 +0000 |
| commit | d7831e7c477f3e5e0d969c09478c2c1b5c82b354 (patch) | |
| tree | 473614bb9d859a4cd9612dcff583b18875b9b7f2 | |
| parent | ad8bd7f8c1a22a1ad23b14db2dbdfdf5cd42f8a1 (diff) | |
| download | gdb-d7831e7c477f3e5e0d969c09478c2c1b5c82b354.zip gdb-d7831e7c477f3e5e0d969c09478c2c1b5c82b354.tar.gz gdb-d7831e7c477f3e5e0d969c09478c2c1b5c82b354.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 19 | ||||
| -rw-r--r-- | libiberty/testsuite/Makefile.in | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 34e01a8..6ac77d7 100644 --- 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 570d2e8..90686f0 100644 --- 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 6979d94..56800a7 100644 --- 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: |