2000-10-07 16:50:14 ShengHuo ZHU <zsh@cs.rochester.edu>

	* Makefile.in: Use install-info.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 62fc8a5..a765f1e 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-07 16:50:14  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in: Use install-info.
+
 2000-10-06 14:38:27  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.texi (Message Headers): Add.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 8b5a002..b6a11eb 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -20,8 +20,9 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 PAPERTYPE=a4
+INFO_DEPS=gnus message emacs-mime
 
-all: gnus message emacs-mime
+all: $(INFO_DEPS)
 
 most: texi2latex.elc latex latexps
 
@@ -37,7 +38,7 @@ most: texi2latex.elc latex latexps
 dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
 
 pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
- 
+
 .texi.dvi :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
        $(TEXI2DVI) gnustmp.texi
@@ -126,20 +127,29 @@ veryclean:
 
 distclean:
        make clean
-       rm -f *.orig *.rej *.elc *~ gnus gnus-[0-9] gnus-[0-9][0-9] Makefile
-       rm -f message message-[0-9]
-       rm -f emacs-mime
+       rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9] Makefile
+       rm -f message-[0-9]
+       rm -f $(INFO_DEPS)
 
-install:
+install: $(INFO_DEPS)
        $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
-       @for file in gnus message emacs-mime; do \
-         for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-           if test -f $$ifile; then \
-             echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
-             $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
+       @list='$(INFO_DEPS)'; \
+       for file in $$list; do \
+         d=$(srcdir); \
+         for ifile in `CDPATH=: && 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; \
            else : ; fi; \
          done; \
        done
+       @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 || :;\
+         done; \
+       else : ; fi
 
 tmps:
        if [ ! -e tmp ]; then mkdir tmp; fi