Install el.

Add uninstall.

diff --git a/ChangeLog b/ChangeLog
index fd7854a..437a119 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-06 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in (uninstall): Add.
+       
+       * etc/Makefile.in (uninstall): Add.
+
 2001-09-27 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * aclocal.m4 (GNUS_CHECK_FONTS): Typo. Use /dev/null as latex input.

diff --git a/Makefile.in b/Makefile.in
index 0d43c89..91bc14c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,11 @@ install:
        cd texi && $(MAKE) EMACS="$(EMACS)" install
        cd etc && $(MAKE) EMACS="$(EMACS)" install
 
+uninstall:
+       cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
+       cd texi && $(MAKE) uninstall
+       cd etc && $(MAKE) uninstall
+
 # Rule for Lars and nobody else.
 some:
        cd lisp && $(MAKE) EMACS="$(EMACS)" some

diff --git a/etc/Makefile.in b/etc/Makefile.in
index f81c462..a552a89 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -35,6 +35,19 @@ install:
          $(INSTALL_DATA) $$p $(etcdir)/$$p; \
        done
 
+uninstall: 
+       rm -f $(etcdir)/gnus-tut.txt
+       cd $(srcdir) \
+       && for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
+         rm -f "$(etcdir)/$$p"; \
+       done
+       rmdir $(etcdir)/gnus 2> /dev/null || true
+       cd $(srcdir) \
+       && for p in smilies/*.pbm; do \
+         rm -f "$(etcdir)/$$p"; \
+       done
+       rmdir $(etcdir)/smilies 2> /dev/null || true
+
 Makefile: $(srcdir)/Makefile.in ../config.status
        cd .. \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fb4cd8..8ef4940 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-06 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in: Install el in install. Add uninstall.
+
 2001-10-05  Simon Josefsson  <jas@extundo.com>
 
        * nnheader.el (gnus-verbose-backends, gnus-nov-is-evil): Custom.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index cb91295..75985da 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -29,22 +29,37 @@ warn: clean-some gnus-load.elc
 clever some: gnus-load.elc
        $(EMACS_COMP) -f dgnushack-compile
 
-install: clever
-       rm -f dgnushack.elc
+install: install-el install-elc 
+
+install-el:
        $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
+       echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
+       $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
        for p in *.elc; do \
-         echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
-         $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+         p=`basename $$p c`; \
+         if [ -e "$(srcdir)/$$p" ]; then \
+           echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+           $(INSTALL_DATA) $(srcdir)/$$p $(lispdir)/$$p; \
+         fi; \
        done
 
-install-el:
+install-elc: clever
+       rm -f dgnushack.elc
        $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
-       cd $(srcdir) \
-       && for p in *.el; do \
+       for p in *.elc; do \
          echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
          $(INSTALL_DATA) $$p $(lispdir)/$$p; \
        done
 
+uninstall:
+       for p in *.elc; do \
+         rm -f "$(lispdir)/$$p"; \
+       done
+       cd $(srcdir); \
+       for p in *.el; do \
+         rm -f "$(lispdir)/$$p"; \
+       done
+
 tags:
        etags *.el
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 564fe82..78e113a 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-06 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in (uninstall): Add uninstall.
+
 2001-10-05  Simon Josefsson  <jas@extundo.com>
 
        * Makefile.in (clean): Add gnusconfig.tex.  Suggested by Henrik

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 089c051..d46bdc0 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -181,6 +181,21 @@ install: $(INFO_DEPS)
          done; \
        else : ; fi
 
+uninstall:
+       @list='$(INFO_DEPS)'; \
+       for file in $$list; do \
+         for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+           rm -f $(infodir)/$$ifile; \
+         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 --delete --info-dir=$(infodir) $(infodir)/$$file";\
+           install-info --delete --info-dir=$(infodir) $(infodir)/$$file || :;\
+         done; \
+       else : ; fi
+
 tmps: 
        cd ps; make all
        for j in ps/picons-*.ps; do \