diff options
author | Daniel Jacobowitz <dan@debian.org> | 2003-12-14 20:28:56 +0000 |
---|---|---|
committer | Daniel Jacobowitz <dan@debian.org> | 2003-12-14 20:28:56 +0000 |
commit | ce05fcf529ba4d8eee9e20ad733a0e0348d0a176 (patch) | |
tree | 94075fe057415326e06a447e0f40da16c8ad19ca /etc | |
parent | eaeffedefaf5d7728c092506e48092ec09234d6b (diff) | |
download | gdb-ce05fcf529ba4d8eee9e20ad733a0e0348d0a176.tar.gz |
Merge drow-cplus-branch to:
cvs rtag -D 2003-12-14 00:00:00 UTC drow-cplus-merge-20031214 gdb+dejagnu
Diffstat (limited to 'etc')
-rw-r--r-- | etc/ChangeLog | 9 | ||||
-rw-r--r-- | etc/Makefile.in | 8 | ||||
-rw-r--r-- | etc/configure.texi | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index debe735ca99..6865f2df185 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,12 @@ +2003-05-16 Kelley Cook <kelleycook@wideopenwest.com> + + * configure.texi: Use "i[3-7]86" in example. + +2003-01-02 H.J. Lu <hjl@gnu.org> + + * Makefile.in (DESTDIR): New. + (install-info): Use it. + 2002-06-11 Nick Clifton <nickc@cambridge.redhat.com> Import the following patches from the FSF GCC sources: diff --git a/etc/Makefile.in b/etc/Makefile.in index 2bc34574540..63f7738c64a 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -2,6 +2,8 @@ # Makefile.in for etc # +DESTDIR = + prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -68,17 +70,17 @@ info: done install-info: info - $(SHELL) $(srcdir)/../mkinstalldirs $(infodir) + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir) if test ! -f standards.info; then cd $(srcdir); fi; \ if test -f standards.info; then \ for i in standards.info*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ done; \ fi if test ! -f configure.info; then cd $(srcdir); fi; \ if test -f configure.info; then \ for i in configure.info*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ done; \ fi diff --git a/etc/configure.texi b/etc/configure.texi index 91401671f92..d69dc414d0f 100644 --- a/etc/configure.texi +++ b/etc/configure.texi @@ -1451,7 +1451,7 @@ canonical configuration name (which will be the case if @smallexample case "$@{host@}" in -i[3456]86-*-linux-gnu*) do something ;; +i[3-7]86-*-linux-gnu*) do something ;; sparc*-sun-solaris2.[56789]*) do something ;; sparc*-sun-solaris*) do something ;; mips*-*-elf*) do something ;; @@ -1465,7 +1465,7 @@ field, in order to match the version number which will be generated by In most cases you must be careful to match a range of processor types. For most processor families, a trailing @samp{*} suffices, as in @samp{mips*} above. For the i386 family, something along the lines of -@samp{i[3456]86} suffices at present. For the m68k family, you will +@samp{i[3-7]86} suffices at present. For the m68k family, you will need something like @samp{m68*}. Of course, if you do not need to match on the processor, it is simpler to just replace the entire field by a @samp{*}, as in @samp{*-*-irix*}. |