From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29082 invoked by alias); 25 Nov 2002 01:09:30 -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 29074 invoked from network); 25 Nov 2002 01:09:29 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 25 Nov 2002 01:09:29 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id gAP0jEP05069 for ; Sun, 24 Nov 2002 19:45:14 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id gAP19TD00375 for ; Sun, 24 Nov 2002 20:09:29 -0500 Received: from localhost.redhat.com (romulus-int.sfbay.redhat.com [172.16.27.46]) by pobox.corp.redhat.com (8.11.6/8.11.6) with ESMTP id gAP19Sw19860 for ; Sun, 24 Nov 2002 20:09:28 -0500 Received: by localhost.redhat.com (Postfix, from userid 469) id 04886FF79; Sun, 24 Nov 2002 20:05:13 -0500 (EST) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15841.30537.977839.406061@localhost.redhat.com> Date: Sun, 24 Nov 2002 17:09:00 -0000 To: gdb-patches@sources.redhat.com Subject: [RFA] mmalloc Makefile patch X-SW-Source: 2002-11/txt/msg00594.txt.bz2 Turns out that the mmalloc.info file sufeered from the same problesm as the gdb info files. Elena 2002-11-24 Elena Zannoni * Makefile.in (INFO_DEPS): Define. (all): Add install-info to the rule. (info): Unse INFO_DEPS. (install-info): Rewrite. (uninstall-info): New. (uninstall): New. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/mmalloc/Makefile.in,v retrieving revision 1.3 diff -u -p -r1.3 Makefile.in --- Makefile.in 17 May 2000 11:45:56 -0000 1.3 +++ Makefile.in 25 Nov 2002 01:07:37 -0000 @@ -64,6 +64,9 @@ MAKEINFO=makeinfo SET_TEXINPUTS = TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$$TEXINPUTS +# Files which should be generated via 'info' and installed by 'install-info' +INFO_DEPS = mmalloc.info + # The TeX formatter TEX = tex @@ -94,9 +97,9 @@ TARGETOBJS = mm.o STAGESTUFF = $(TARGETLIB) *.o -all: $(TARGETLIB) +all: $(TARGETLIB) install-info -info: mmalloc.info +info: $(INFO_DEPS) dvi: mmalloc.dvi clean-info: installcheck: @@ -110,14 +113,41 @@ mmalloc.dvi: mmalloc.texi rm -f mmalloc.?? mmalloc.??s mmalloc.log mmalloc.aux mmalloc.toc install-info: info - $(SHELL) $(srcdir)/../mkinstalldirs $(infodir) - if test ! -f mmalloc.info ; then cd $(srcdir); fi; \ - $(INSTALL_DATA) mmalloc.info $(infodir)/mmalloc.info + @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 $(DESTDIR)$(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ + else : ; fi; \ + done; \ + done + $(POST_INSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - echo " install-info --info-dir=$(infodir) $(infodir)/mmalloc.info";\ - install-info --info-dir=$(infodir) $(infodir)/mmalloc.info || :;\ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ + done; \ else : ; fi +uninstall-info: + $(PRE_UNINSTALL) + @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ + ii=yes; \ + else ii=; fi; \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + test -z "$$ii" \ + || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done + $(NORMAL_UNINSTALL) + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + done + check: test1.c # $(CC) -g $(srcdir)/test1.c libmmalloc.a # This loses for Canadian cross (building mmalloc with a cross-compiler). @@ -129,6 +159,8 @@ install: all $(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB)n $(RANLIB) $(libdir)/$(TARGETLIB)n mv -f $(libdir)/$(TARGETLIB)n $(libdir)/$(TARGETLIB) + +uninstall: uninstall-info $(TARGETLIB): $(TARGETOBJS) $(RM) -rf $@