2002-11-26 Elena Zannoni <ezannoni@redhat.com>

        * Makefile.in (INFO_DEPS): Define.
        (all): Add install-info to the rule.
        (info): Unse INFO_DEPS.
        (install-info): Rewrite.
        (uninstall-info): New.
        (uninstall): New.

diff --git a/mmalloc/ChangeLog b/mmalloc/ChangeLog
index 8b59d38c68b0796f084cf8dbc7ac422a88d90c9c..4abbd68f5db3d8e3fdbd9d7342d8023895eb3645 100644 (file)
--- a/mmalloc/ChangeLog
+++ b/mmalloc/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-26  Elena Zannoni  <ezannoni@redhat.com>
+
+       * Makefile.in (INFO_DEPS): Define.
+       (all): Add install-info to the rule.
+       (info): Unse INFO_DEPS.
+       (install-info): Rewrite.
+       (uninstall-info): New.
+       (uninstall): New.
+
 2002-04-07  Andrew Cagney  <ac131313@redhat.com>
 
        From 2002-03-05 Scott Pakin <pakin@uiuc.edu>

diff --git a/mmalloc/Makefile.in b/mmalloc/Makefile.in
index cde39897aaa01b06116c26789a64ad015796f750..d0aed410c66e515ad036e2fe9709c00f8450dfc9 100644 (file)
--- a/mmalloc/Makefile.in
+++ b/mmalloc/Makefile.in
@@ -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).
@@ -130,6 +160,8 @@ install:    all
                $(RANLIB) $(libdir)/$(TARGETLIB)n
                mv -f $(libdir)/$(TARGETLIB)n $(libdir)/$(TARGETLIB)
 
+uninstall:     uninstall-info
+
 $(TARGETLIB):  $(TARGETOBJS)
                $(RM) -rf $@
                $(AR) $(AR_FLAGS) $@ $(TARGETOBJS)