From c938e9b01dd1735e2cf1f55f65117f701de560cc Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 8 Aug 2003 17:30:37 +0000 Subject: [PATCH] gdb/ 2003-08-08 H.J. Lu * Makefile.in (FLAGS_TO_PASS): Add DESTDIR. (install-only): Support DESTDIR. (uninstall): Likewise. (install-gdbtk): Likewise. gdb/doc/ 2003-08-08 H.J. Lu * Makefile.in (install-info): Support DESTDIR. (install-html): Likewise. gdb/gdbserver/ 2003-08-08 H.J. Lu * Makefile.in (install-only): Create dest dir. Support DESTDIR. (uninstall): Support DESTDIR. mmalloc/ 2003-08-08 H.J. Lu * Makefile.in (install-info): Create dest dir. Support DESTDIR. (install): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 8 +++++--- gdb/doc/ChangeLog | 5 +++++ gdb/doc/Makefile.in | 12 ++++++------ gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/Makefile.in | 8 +++++--- mmalloc/ChangeLog | 5 +++++ mmalloc/Makefile.in | 8 +++++--- 8 files changed, 43 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 939eb219be..c7685fba75 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-08-08 H.J. Lu + + * Makefile.in (FLAGS_TO_PASS): Add DESTDIR. + (install-only): Support DESTDIR. + (uninstall): Likewise. + (install-gdbtk): Likewise. + 2003-08-08 Elena Zannoni * symtab.c (lookup_symbol_aux): Make sure that is_a_field_of_this diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 3299c9741a..25d054e12f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -430,6 +430,7 @@ FLAGS_TO_PASS = \ "datadir=$(datadir)" \ "includedir=$(includedir)" \ "against=$(against)" \ + "DESTDIR=$(DESTDIR)" \ "AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ @@ -963,7 +964,7 @@ install-only: $(CONFIG_INSTALL) else \ true ; \ fi ; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(bindir) ; \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ; \ $(INSTALL_PROGRAM) gdb$(EXEEXT) \ $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ $(SHELL) $(srcdir)/../mkinstalldirs \ @@ -980,7 +981,8 @@ uninstall: force $(CONFIG_UNINSTALL) else \ true ; \ fi ; \ - rm -f $(bindir)/$$transformed_name$(EXEEXT) $(man1dir)/$$transformed_name.1 + rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \ + $(DESTDIR)$(man1dir)/$$transformed_name.1 @$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do # We do this by grepping through sources. If that turns out to be too slow, @@ -2471,7 +2473,7 @@ install-gdbtk: else \ true ; \ fi ; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(bindir); \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir); \ $(INSTALL_PROGRAM) insight$(EXEEXT) \ $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ $(SHELL) $(srcdir)/../mkinstalldirs \ diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 8ddd72334a..14e3887b5a 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 H.J. Lu + + * Makefile.in (install-info): Support DESTDIR. + (install-html): Likewise. + 2003-08-07 Andrew Cagney Patch from Nick Roberts. diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 4e8c64ea81..a06cc4ac71 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -156,14 +156,14 @@ all-doc: info dvi ps # pdf diststuff: info install-info: $(INFO_DEPS) - $(SHELL) $(srcdir)/../../mkinstalldirs $(infodir) + $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(infodir) @list='$(INFO_DEPS)'; \ for file in $$list; do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \ + echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ else : ; fi; \ done; \ done @@ -171,8 +171,8 @@ install-info: $(INFO_DEPS) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ - install-info --info-dir=$(infodir) $(infodir)/$$file || :;\ + echo " install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file";\ + install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ done; \ else : ; fi @@ -194,7 +194,7 @@ uninstall-info: install-html: html for i in *.html ; do \ - $(INSTALL_DATA) $$i $(htmldir)/$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; \ done STAGESTUFF = *.info* gdb-all.texi GDBvn.texi *.ps *.dvi *.pdf diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 98c831280e..42dab168db 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 H.J. Lu + + * Makefile.in (install-only): Create dest dir. Support DESTDIR. + (uninstall): Support DESTDIR. + Mon Jul 21 20:09:34 UTC 2003 Brendan Conoboy * configure.srv: Add xscale*linux copy of arm*linux entry. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 80667f9c6c..8554dae9af 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -151,13 +151,15 @@ install: all install-only install-only: n=`echo gdbserver | sed '$(program_transform_name)'`; \ if [ x$$n = x ]; then n=gdbserver; else true; fi; \ - $(INSTALL_PROGRAM) gdbserver $(bindir)/$$n; \ - $(INSTALL_DATA) $(srcdir)/gdbserver.1 $(man1dir)/$$n.1 + $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir); \ + $(INSTALL_PROGRAM) gdbserver $(DESTDIR)$(bindir)/$$n; \ + $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \ + $(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1 uninstall: force n=`echo gdbserver | sed '$(program_transform_name)'`; \ if [ x$$n = x ]; then n=gdbserver; else true; fi; \ - rm -f $(bindir)/$$n $(man1dir)/$$n.1 + rm -f $(bindir)/$$n $(DESTDIR)$(man1dir)/$$n.1 installcheck: check: diff --git a/mmalloc/ChangeLog b/mmalloc/ChangeLog index a46ca3666a..a1e3ad0af0 100644 --- a/mmalloc/ChangeLog +++ b/mmalloc/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 H.J. Lu + + * Makefile.in (install-info): Create dest dir. Support DESTDIR. + (install): Likewise. + 2002-11-28 Elena Zannoni * Makefile.in (install): Move install-info to here... diff --git a/mmalloc/Makefile.in b/mmalloc/Makefile.in index 06fbd9c383..b05aea7b08 100644 --- a/mmalloc/Makefile.in +++ b/mmalloc/Makefile.in @@ -113,6 +113,7 @@ mmalloc.dvi: mmalloc.texi rm -f mmalloc.?? mmalloc.??s mmalloc.log mmalloc.aux mmalloc.toc install-info: info + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir) @list='$(INFO_DEPS)'; \ for file in $$list; do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ @@ -156,9 +157,10 @@ check: test1.c # ./a.out install: all install-info - $(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB)n - $(RANLIB) $(libdir)/$(TARGETLIB)n - mv -f $(libdir)/$(TARGETLIB)n $(libdir)/$(TARGETLIB) + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n + $(RANLIB) $(DESTDIR)$(libdir)/$(TARGETLIB)n + mv -f $(DESTDIR)$(libdir)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(TARGETLIB) uninstall: uninstall-info -- 2.34.1