From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18669 invoked by alias); 7 Aug 2003 22:53:19 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 18662 invoked from network); 7 Aug 2003 22:53:18 -0000 Received: from unknown (HELO rwcrmhc12.comcast.net) (216.148.227.85) by sources.redhat.com with SMTP; 7 Aug 2003 22:53:18 -0000 Received: from lucon.org ([12.234.88.5]) by comcast.net (rwcrmhc12) with ESMTP id <20030807225318014002mecje>; Thu, 7 Aug 2003 22:53:18 +0000 Received: by lucon.org (Postfix, from userid 1000) id 08D872C4E5; Thu, 7 Aug 2003 22:53:15 +0000 (UTC) Date: Thu, 07 Aug 2003 22:53:00 -0000 From: "H. J. Lu" To: Andrew Cagney Cc: GDB Subject: Re: PATCH: Support DESTDIR Message-ID: <20030807225314.GA27827@lucon.org> References: <20030731220953.GA18365@lucon.org> <3F2E6A53.70207@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="WIyZ46R2i8wDzkSu" Content-Disposition: inline In-Reply-To: <3F2E6A53.70207@redhat.com> User-Agent: Mutt/1.4.1i X-SW-Source: 2003-08/txt/msg00112.txt.bz2 --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 622 On Mon, Aug 04, 2003 at 10:14:43AM -0400, Andrew Cagney wrote: > Hmm, which of these is correct: > > >- $(SHELL) $(srcdir)/../../mkinstalldirs $(infodir) > >+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)/$(infodir) > > >- $(INSTALL_DATA) $$i $(htmldir)/$$i ; \ > >+ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; \ > > (the slash)? > > > + $(mkinstalldirs) $(DESTDIR)$(infodir) > > Please keep the mkinstalldirs consistent with the rest of GDB vis: > $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$infodir) > The addition of mkinstalldirs should be mentioned in the ChangeLog. > Here is the new one. H.J. --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="gdb-install-2.patch" Content-length: 5548 gdb/ 2003-08-07 H.J. Lu * Makefile.in (FLAGS_TO_PASS): Add DESTDIR. (install-only): Support DESTDIR. (uninstall): Likewise. (install-gdbtk): Likewise. gdb/doc/ 2003-08-07 H.J. Lu * Makefile.in (install-info): Support DESTDIR. (install-html): Likewise. gdb/gdbserver/ 2003-08-07 H.J. Lu * Makefile.in (install-only): Create dest dir. Support DESTDIR. (uninstall): Support DESTDIR. mmalloc/ 2003-07-31 H.J. Lu * Makefile.in (install-info): Create dest dir. Support DESTDIR. (install): Likewise. --- gdb/gdb/Makefile.in.install 2003-08-06 19:59:38.000000000 -0700 +++ gdb/gdb/Makefile.in 2003-08-06 20:42:32.000000000 -0700 @@ -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 \ --- gdb/gdb/doc/Makefile.in.install 2003-08-06 19:59:40.000000000 -0700 +++ gdb/gdb/doc/Makefile.in 2003-08-06 20:07:00.000000000 -0700 @@ -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 --- gdb/gdb/gdbserver/Makefile.in.install 2003-07-08 13:09:11.000000000 -0700 +++ gdb/gdb/gdbserver/Makefile.in 2003-08-06 20:06:21.000000000 -0700 @@ -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: --- gdb/mmalloc/Makefile.in.install 2002-11-28 08:46:31.000000000 -0800 +++ gdb/mmalloc/Makefile.in 2003-08-06 20:47:07.000000000 -0700 @@ -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 --WIyZ46R2i8wDzkSu--