diff options
| author | Masaki Muranaka <monaka@monami-software.com> | 2014-08-01 08:01:48 -0700 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2014-08-01 08:04:07 -0700 |
| commit | 90debf20f4cc4ddd7cfb6356fe0d3876a18604a6 (patch) | |
| tree | ef81dcaf387c3b623d2c00d57a01d548b9946150 | |
| parent | 6908c50982bc70ff9e035028b3bc300f80fed7e4 (diff) | |
| download | gdb-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6.zip gdb-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6.tar.gz gdb-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6.tar.bz2 | |
[gdb/doc] Add target triplet to man files
After applying hash 43662968, gdb.1 and other man pages are not added
target triplet even if we configure with --target=.
It causes conflicts on some distributions.
And uninstall rules requires $(transform) variable.
gdb/doc/ChangeLog:
* Makefile.in (transform): New variable.
(install-man1, install-man5): Apply $(transform) to man file names.
Tested by installing both native and cross debugger.
| -rw-r--r-- | gdb/doc/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/doc/Makefile.in | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 0bfddd7..20ce293 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,9 @@ +2014-08-01 Masaki Muranaka <monaka@monami-software.com> + + Pushed by Joel Brobecker <brobecker@adacore.com>. + * Makefile.in (transform): New variable. + (install-man1, install-man5): Apply $(transform) to man file names. + 2014-07-26 Doug Evans <xdje42@gmail.com> PR guile/17177 diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index c9c8c85..d32bd1a 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -30,6 +30,8 @@ mandir = @mandir@ man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 +transform = @program_transform_name@ + SHELL = @SHELL@ LN_S = @LN_S@ @@ -308,7 +310,7 @@ install-man1: $(MAN1S) continue; \ fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=`echo $$p | sed -e 's|^.*/||'`; \ + f=`echo $$p | sed -e 's|^.*/||' -e '$(transform)'`; \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(man1dir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(man1dir)/$$f"; \ done @@ -317,7 +319,7 @@ install-man5: $(MAN5S) test -z "$(man5dir)" || $(mkinstalldirs) "$(DESTDIR)$(man5dir)" @list='$(MAN5S)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=`echo $$p | sed -e 's|^.*/||'`; \ + f=`echo $$p | sed -e 's|^.*/||' -e '$(transform)'`; \ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(man5dir)/$$f'"; \ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(man5dir)/$$f"; \ done |