branch: externals/auctex
commit b853739ab866275fa27f115b8fd117f1e5e14d92
Author: Mosè Giordano <m...@gnu.org>
Commit: Mosè Giordano <m...@gnu.org>
Add uninstall rules to Makefiles.
* doc/install.texi: Mention uninstallation in menus.
(Build/install and uninstall): Add "Uninstallation" index entry.
Document uninstallation process.
* Makefile.in: Update copyright years.
(.PHONY): Add uninstall rule.
(uninstall): New rule.
* doc/Makefile.in: Update copyright years.
(.PHONY): Add uninstall rule.
(uninstall): New rule.
* latex/Makefile.in: Update copyright years.
(.PHONY): Declare phony targets.
(install-texmf-doc): Do not ignore errors in this rule.
(uninstall): New rule.
---
ChangeLog | 19 +++++++++++++++++++
Makefile.in | 19 +++++++++++++++++--
doc/Makefile.in | 14 ++++++++++++--
doc/install.texi | 26 ++++++++++++++++++++++----
latex/Makefile.in | 14 ++++++++++----
5 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b9e1a84..984547e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-03-07 Mos� Giordano <m...@gnu.org>
+
+ * doc/install.texi: Mention uninstallation in menus.
+ (Build/install and uninstall): Add "Uninstallation" index entry.
+ Document uninstallation process.
+
+ * Makefile.in: Update copyright years.
+ (.PHONY): Add uninstall rule.
+ (uninstall): New rule.
+
+ * doc/Makefile.in: Update copyright years.
+ (.PHONY): Add uninstall rule.
+ (uninstall): New rule.
+
+ * latex/Makefile.in: Update copyright years.
+ (.PHONY): Declare phony targets.
+ (install-texmf-doc): Do not ignore errors in this rule.
+ (uninstall): New rule.
+
2015-03-03 Tassilo Horn <t...@gnu.org>
* doc/auctex.texi (Filling): Document LaTeX-fill-excluded-macros.
diff --git a/Makefile.in b/Makefile.in
index 9320db2..5e1b261 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: auctex-de...@gnu.org
-# Copyright (C) 2003-2008, 2010, 2013, 2014 Free Software
+# Copyright (C) 2003-2008, 2010, 2013-2015 Free Software
# Foundation, Inc.
# This file is part of AUCTeX.
@@ -184,7 +184,7 @@ all: texmf lisp docs
install-man clean distclean maintainer-clean extraclean \
tar-ball-clean check-tag check release-commit dist snapshot \
patch tar-ball rpm-packages wc xemacs-package windows-package \
- release-sign release-upload preview-ball
+ release-sign release-upload preview-ball uninstall
texmf: latex/Makefile
$(TEXMF)
@@ -352,6 +352,21 @@ install-metadata:
echo "pkginfo/MANIFEST.$(PACKAGE)" >> "pkginfo/MANIFEST.$(PACKAGE)" ;
\
}
+uninstall:
+ rm -rf $(DESTDIR)$(packagelispdir) $(DESTDIR)$(packagedatadir) \
+ $(DESTDIR)$(autodir)
+ if test X$(packagedir) = Xno ; then \
+ rm -f $(DESTDIR)$(lispdir)/tex-site.el \
+ $(DESTDIR)$(auctexstartfile) ; \
+ else \
+ rm -f $(DESTDIR)$(packagedir)/man/auctex/RELEASE \
+ $(DESTDIR)$(packagedir)/pkginfo/MANIFEST.$(PACKAGE); \
+ fi
+ cd doc ; $(MAKE) DESTDIR=$(DESTDIR) uninstall
+ rm -f $(DESTDIR)$(previewstartfile)
+ rm -rf $(DESTDIR)$(packagelispdir)
+ (cd latex ; $(MAKE) DESTDIR=$(DESTDIR) uninstall)
+
.el.elc:
$(ELCC) -f batch-byte-compile $<
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0855186..01e7e2a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: auctex-de...@gnu.org
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008, 2013-2015 Free Software Foundation, Inc.
# This file is part of AUCTeX.
@@ -90,7 +90,8 @@ dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
extradist: html/$(TEXI2HTML_TOC) auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
.PHONY: all info dvi dist install-auctex disttexts clean distclean \
- maintainer-clean install-preview install-man html-docs extradist
+ maintainer-clean install-preview install-man uninstall html-docs \
+ extradist
# AUCTeX
@@ -200,6 +201,15 @@ install-preview: preview-latex.info
# clean
+uninstall:
+ for info in $(DESTDIR)$(infodir)/{auctex.info,preview-latex.info}; do \
+ test ! -f $${info} || \
+ $(INSTALL_INFO) --delete --info-dir=$(DESTDIR)$(infodir)
$${info}; \
+ done
+ rm -f $(DESTDIR)$(infodir)/auctex.info
$(DESTDIR)$(infodir)/auctex.info-* \
+ $(DESTDIR)$(infodir)/preview-latex.info*
+ test X$(packagedir) != Xno || rm -rf -f $(DESTDIR)$(docdir)
+
clean:
rm -f *.dvi *.ps *.pdf *.aux *.cp *.fn *.ky *.log *~ \#*\# \
*.tp *.vr *.pg *.toc *.tp *.bak *.cps *.kys *.tps \
diff --git a/doc/install.texi b/doc/install.texi
index 24fda96..d814cca 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -43,7 +43,7 @@ the file @file{INSTALL.windows}.
@menu
* Prerequisites::
* Configure::
-* Build/install::
+* Build/install and uninstall::
* Loading the package::
* Advice for package providers::
* Advice for non-privileged users::
@@ -56,7 +56,7 @@ the file @file{INSTALL.windows}.
@menu
* Prerequisites::
* Configure::
-* Build/install::
+* Build/install and uninstall::
* Loading the package::
* Advice for package providers::
* Advice for non-privileged users::
@@ -270,11 +270,12 @@ It is to be used when you are using
@code{--with-tex-dir=@var{/dir}},
but is normally not necessary otherwise.
@end table
-@node Build/install
-@section Build/install
+@node Build/install and uninstall
+@section Build/install and uninstall
@cindex Installation
@cindex Make
+@cindex Uninstallation
Once @command{configure} has been run, simply enter
@@ -291,9 +292,21 @@ locations chosen earlier, type
make install
@end example
+@noindent
You may need special privileges to install, e.g., if you are installing
into system directories.
+Should you want to completely remove the installed package, in the same
+directory you built @AUCTeX{} run
+
+@example
+make uninstall
+@end example
+
+@noindent
+You will need administration privileges if you installed the package
+into system directories.
+
@node Loading the package
@section Loading the package
@cindex @file{.emacs}
@@ -575,3 +588,8 @@ directories will be searched recursively, so there is no
reason to list
subdirectories explicitly. Automatic configuration will already have
set the variable for you if it could use the program @samp{kpsewhich}.
In this case you normally don't have to alter anything.
+
+@c Local Variables:
+@c mode: texinfo
+@c TeX-master: "auctex"
+@c End:
diff --git a/latex/Makefile.in b/latex/Makefile.in
index 8a40ca0..afb0a62 100644
--- a/latex/Makefile.in
+++ b/latex/Makefile.in
@@ -2,7 +2,8 @@
# Maintainer: auctex-de...@gnu.org
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2006, 2008, 2014, 2015 Free Software Foundation,
+# Inc.
# This file is part of AUCTeX.
@@ -41,6 +42,8 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = ../mkinstalldirs
+.PHONY: all install install-texmf install-texmf-doc uninstall clean
+
all: $(TEXMFGEN) preview.drv preview-mk.ins preview.dvi preview.pdf
install: install-texmf install-texmf-doc
@@ -61,9 +64,12 @@ install-texmf: $(TEXMFGEN)
fi
install-texmf-doc: preview.dvi
- -$(MKINSTALLDIRS) $(DESTDIR)$(previewdocdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(previewdocdir)
$(INSTALL_DATA) preview.dvi $(DESTDIR)$(previewdocdir)
+uninstall:
+ rm -rf $(DESTDIR)$(previewdocdir)/preview.dvi
$(DESTDIR)$(previewtexmfdir)
+
preview-mk.ins: preview.dtx bootstrap.ins
$(TEX) '\nonstopmode \input bootstrap.ins'
@@ -87,5 +93,5 @@ preview.pdf: preview.drv preview.dtx preview.sty
$(PDFLATEX) '\nonstopmode
\AtBeginDocument{\OnlyDescription}\input{preview.drv}'
clean:
- rm -f *~ *.aux *.dvi *.drv *.log
- rm -f $(TEXMFGEN) preview.ins preview-mk.ins
+ rm -f *~ *.aux *.dvi *.drv *.log
+ rm -f $(TEXMFGEN) preview.ins preview-mk.ins
