From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25297 invoked by alias); 31 Jul 2003 22:09:58 -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 25255 invoked from network); 31 Jul 2003 22:09:56 -0000 Received: from unknown (HELO sccrmhc12.comcast.net) (204.127.202.56) by sources.redhat.com with SMTP; 31 Jul 2003 22:09:56 -0000 Received: from lucon.org ([12.234.88.5]) by comcast.net (sccrmhc12) with ESMTP id <2003073122095601200o7qrce>; Thu, 31 Jul 2003 22:09:56 +0000 Received: by lucon.org (Postfix, from userid 1000) id C03692C4EB; Thu, 31 Jul 2003 22:09:53 +0000 (UTC) Date: Thu, 31 Jul 2003 22:09:00 -0000 From: "H. J. Lu" To: GDB Subject: PATCH: Support DESTDIR Message-ID: <20030731220953.GA18365@lucon.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-SW-Source: 2003-07/txt/msg00567.txt.bz2 This patch makes "make DESTDIR=foo" to work. H.J. --- gdb/ 2003-07-31 H.J. Lu * Makefile.in (FLAGS_TO_PASS): Add DESTDIR. gdb/doc/ 2003-07-31 H.J. Lu * Makefile.in (install-info): Support DESTDIR. (install-html): Likewise. gdb/gdbserver/ 2003-07-31 H.J. Lu * Makefile.in (install-only): Support DESTDIR. (uninstall): Likewise. mmalloc/ 2003-07-31 H.J. Lu * Makefile.in (top_srcdir): New. (mkinstalldirs): New. (install-info): Support DESTDIR. (install): Likewise. --- gdb/gdb/Makefile.in.install 2003-07-30 09:43:49.000000000 -0700 +++ gdb/gdb/Makefile.in 2003-07-31 14:59:16.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)" \ --- gdb/gdb/doc/Makefile.in.install 2003-07-30 09:43:55.000000000 -0700 +++ gdb/gdb/doc/Makefile.in 2003-07-31 15:05:54.000000000 -0700 @@ -155,14 +155,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 @@ -170,8 +170,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 @@ -193,7 +193,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-07-31 14:59:01.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-07-31 15:02:28.000000000 -0700 @@ -25,6 +25,7 @@ VPATH = @srcdir@ srcdir = @srcdir@ +top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -52,6 +53,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs + AR = @AR@ AR_FLAGS = qv CFLAGS = -g @@ -113,6 +116,7 @@ mmalloc.dvi: mmalloc.texi rm -f mmalloc.?? mmalloc.??s mmalloc.log mmalloc.aux mmalloc.toc install-info: info + $(mkinstalldirs) $(DESTDIR)$(infodir) @list='$(INFO_DEPS)'; \ for file in $$list; do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ @@ -156,9 +160,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) + $(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