From 72bdd9279d3264e49a74f58c2dc9472bed2230dc Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 9 Nov 2002 03:14:11 +0000 Subject: [PATCH] 2002-11-08 Andrew Cagney * Makefile.in (DESTDIR): Define. (install-only, install-gdbtk, uninstall-gdbtk): Add $(DESTDIR) prefix. --- gdb/ChangeLog | 4 ++++ gdb/Makefile.in | 40 +++++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6852a52fadf..b87159b6a77 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2002-11-08 Andrew Cagney + * Makefile.in (DESTDIR): Define. + (install-only, install-gdbtk, uninstall-gdbtk): Add $(DESTDIR) + prefix. + * config/djgpp/fnchange.lst: 8.3 proof i386obsd-nat.c and i386obsd-tdep.c. Rename to "gdb.cxx", paths containing "gdb.c++". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index da33b76fb63..aa401e47f7e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -55,6 +55,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +DESTDIR = + AR = @AR@ AR_FLAGS = qv RANLIB = @RANLIB@ @@ -922,9 +924,12 @@ install-only: $(CONFIG_INSTALL) true ; \ fi ; \ $(srcdir)/../mkinstalldirs $(bindir) ; \ - $(INSTALL_PROGRAM) gdb$(EXEEXT) $(bindir)/$$transformed_name$(EXEEXT) ; \ - $(srcdir)/../mkinstalldirs $(man1dir) ; \ - $(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1 + $(INSTALL_PROGRAM) gdb$(EXEEXT) \ + $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ + $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(man1dir) ; \ + $(INSTALL_DATA) $(srcdir)/gdb.1 \ + $(DESTDIR)$(man1dir)/$$transformed_name.1 @$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do uninstall: force $(CONFIG_UNINSTALL) @@ -2355,20 +2360,25 @@ install-gdbtk: true ; \ fi ; \ $(SHELL) $(srcdir)/../mkinstalldirs $(bindir); \ - $(INSTALL_PROGRAM) insight$(EXEEXT) $(bindir)/$$transformed_name$(EXEEXT) ; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY) ; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(libdir)/insight$(GDBTK_VERSION) ; \ - $(INSTALL_DATA) $(srcdir)/gdbtk/plugins/plugins.tcl $(libdir)/insight$(GDBTK_VERSION)/plugins.tcl ; \ + $(INSTALL_PROGRAM) insight$(EXEEXT) \ + $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ + $(SHELL) $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(GDBTK_LIBRARY) ; \ + $(SHELL) $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(libdir)/insight$(GDBTK_VERSION) ; \ + $(INSTALL_DATA) $(srcdir)/gdbtk/plugins/plugins.tcl \ + $(DESTDIR)$(libdir)/insight$(GDBTK_VERSION)/plugins.tcl ; \ + $(SHELL) $(srcdir)/../mkinstalldirs \ + $(DESTDIR)$(GDBTK_LIBRARY)/images \ + $(DESTDIR)$(GDBTK_LIBRARY)/images2 ; \ $(SHELL) $(srcdir)/../mkinstalldirs \ - $(GDBTK_LIBRARY)/images \ - $(GDBTK_LIBRARY)/images2 ; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY)/help \ - $(GDBTK_LIBRARY)/help/images \ - $(GDBTK_LIBRARY)/help/trace ; \ + $(DESTDIR)$(GDBTK_LIBRARY)/help \ + $(DESTDIR)$(GDBTK_LIBRARY)/help/images \ + $(DESTDIR)$(GDBTK_LIBRARY)/help/trace ; \ cd $(srcdir)/gdbtk/library ; \ for i in *.tcl *.itcl *.ith *.itb images/*.gif images2/*.gif images/icons.txt images2/icons.txt tclIndex help/*.html help/trace/*.html help/trace/index.toc help/images/*.gif; \ do \ - $(INSTALL_DATA) $$i $(GDBTK_LIBRARY)/$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(GDBTK_LIBRARY)/$$i ; \ done ; uninstall-gdbtk: @@ -2379,8 +2389,8 @@ uninstall-gdbtk: else \ true ; \ fi ; \ - rm -f $(bindir)/$$transformed_name$(EXEEXT) ; \ - rm -rf $(GDBTK_LIBRARY) + rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \ + rm -rf $(DESTDIR)$(GDBTK_LIBRARY) clean-gdbtk: rm -f insight$(EXEEXT) -- 2.39.2