Change installation directory to version specific one.

This is because Emacs 21 contain newer version of Gnus.

Approved by:	maintainer

5 files changed, 219 insertions, 217 deletions

diff --git a/news/gnus-emacs20/Makefile b/news/gnus-emacs20/Makefile
index 6342363a8f3b..904843790054 100644
--- a/news/gnus-emacs20/Makefile
+++ b/news/gnus-emacs20/Makefile
@@ -27,7 +27,7 @@ HAS_CONFIGURE=	yes
 EMACS_PORT_NAME?=emacs20
 
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
-		--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/gnus \
+		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/gnus \
 		--infodir=${INFODIR}
 
 INFODIR=	${PREFIX}/info
@@ -35,9 +35,8 @@ INFODIR=	${PREFIX}/info
 PORTDOCDIR=	share/doc/gnus-${EMACS_PORT_NAME}
 DOCS=		ChangeLog GNUS-NEWS README
 
-PLIST_SUB=	EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		INFODIR=${INFODIR:S/${PREFIX}\///} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+PLIST_SUB+=	EMACS_PORT_NAME=${EMACS_PORT_NAME} \
+		INFODIR=${INFODIR:S/${PREFIX}\///}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/news/gnus-emacs20/files/patch-aa b/news/gnus-emacs20/files/patch-aa
index 7797baf9cc55..c602d4ff3652 100644
--- a/news/gnus-emacs20/files/patch-aa
+++ b/news/gnus-emacs20/files/patch-aa
@@ -13,7 +13,7 @@
 +@dircategory The Emacs editor and associated tools
  @direntry
 -* Emacs MIME: (emacs-mime).   The MIME de/composition library.
-+* Emacs MIME: (emacs-mime).	The MIME de/composition library.
++* Emacs MIME: (emacs-mime.info).	The MIME de/composition library.
  @end direntry
  @iftex
  @finalout
diff --git a/news/gnus-emacs20/files/patch-ab b/news/gnus-emacs20/files/patch-ab
index 88825e9c00ad..9863ae715f07 100644
--- a/news/gnus-emacs20/files/patch-ab
+++ b/news/gnus-emacs20/files/patch-ab
@@ -13,7 +13,7 @@
 +@dircategory The Emacs editor and associated tools
  @direntry
 -* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (gnus).			The newsreader Gnus.
++* Gnus: (gnus.info).			The newsreader Gnus.
  @end direntry
  @iftex
  @finalout
diff --git a/news/gnus-emacs20/files/patch-ac b/news/gnus-emacs20/files/patch-ac
index 7248ac2da975..0e8eee4732cf 100644
--- a/news/gnus-emacs20/files/patch-ac
+++ b/news/gnus-emacs20/files/patch-ac
@@ -13,7 +13,7 @@
 +@dircategory The Emacs editor and associated tools
  @direntry
 -* Message: (message).   Mail and news composition mode that goes with Gnus.
-+* Message: (message).		Mail and news composition mode that goes with Gnus.
++* Message: (message.info).		Mail and news composition mode that goes with Gnus.
  @end direntry
  @iftex
  @finalout
diff --git a/news/gnus-emacs20/pkg-plist b/news/gnus-emacs20/pkg-plist
index b56be318298e..447018f25a5b 100644
--- a/news/gnus-emacs20/pkg-plist
+++ b/news/gnus-emacs20/pkg-plist
@@ -1,215 +1,218 @@
-%%EMACS_SITE_LISPDIR%%/gnus/base64.el
-%%EMACS_SITE_LISPDIR%%/gnus/binhex.el
-%%EMACS_SITE_LISPDIR%%/gnus/binhex.elc
-%%EMACS_SITE_LISPDIR%%/gnus/dgnushack.el
-%%EMACS_SITE_LISPDIR%%/gnus/earcon.el
-%%EMACS_SITE_LISPDIR%%/gnus/earcon.elc
-%%EMACS_SITE_LISPDIR%%/gnus/flow-fill.el
-%%EMACS_SITE_LISPDIR%%/gnus/flow-fill.elc
-%%EMACS_SITE_LISPDIR%%/gnus/format-spec.el
-%%EMACS_SITE_LISPDIR%%/gnus/format-spec.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-agent.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-agent.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-art.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-art.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-async.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-async.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-audio.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-audio.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-bcklg.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-bcklg.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cache.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cache.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cite.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cite.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cus.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-cus.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-demon.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-demon.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-draft.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-draft.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-dup.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-dup.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-eform.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-eform.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-ems.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-ems.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-gl.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-gl.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-group.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-group.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-int.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-int.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-kill.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-kill.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-load.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-load.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-logic.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-logic.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-mh.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-mh.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-ml.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-ml.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-mlspl.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-mlspl.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-move.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-move.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-msg.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-msg.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-nocem.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-nocem.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-picon.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-range.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-range.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-salt.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-salt.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-score.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-score.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-setup.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-setup.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-soup.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-soup.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-spec.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-spec.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-srvr.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-srvr.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-start.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-start.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-sum.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-sum.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-topic.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-topic.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-undo.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-undo.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-util.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-util.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-uu.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-uu.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-vm.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-vm.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-win.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-win.elc
-%%EMACS_SITE_LISPDIR%%/gnus/gnus-xmas.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus.el
-%%EMACS_SITE_LISPDIR%%/gnus/gnus.elc
-%%EMACS_SITE_LISPDIR%%/gnus/ietf-drums.el
-%%EMACS_SITE_LISPDIR%%/gnus/ietf-drums.elc
-%%EMACS_SITE_LISPDIR%%/gnus/imap.el
-%%EMACS_SITE_LISPDIR%%/gnus/imap.elc
-%%EMACS_SITE_LISPDIR%%/gnus/lpath.el
-%%EMACS_SITE_LISPDIR%%/gnus/mail-parse.el
-%%EMACS_SITE_LISPDIR%%/gnus/mail-parse.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mail-prsvr.el
-%%EMACS_SITE_LISPDIR%%/gnus/mail-prsvr.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mail-source.el
-%%EMACS_SITE_LISPDIR%%/gnus/mail-source.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mailcap.el
-%%EMACS_SITE_LISPDIR%%/gnus/mailcap.elc
-%%EMACS_SITE_LISPDIR%%/gnus/md5.el
-%%EMACS_SITE_LISPDIR%%/gnus/md5.elc
-%%EMACS_SITE_LISPDIR%%/gnus/message.el
-%%EMACS_SITE_LISPDIR%%/gnus/message.elc
-%%EMACS_SITE_LISPDIR%%/gnus/messagexmas.el
-%%EMACS_SITE_LISPDIR%%/gnus/messcompat.el
-%%EMACS_SITE_LISPDIR%%/gnus/messcompat.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-bodies.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-bodies.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-decode.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-decode.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-encode.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-encode.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-partial.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-partial.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-util.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-util.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-uu.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-uu.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mm-view.el
-%%EMACS_SITE_LISPDIR%%/gnus/mm-view.elc
-%%EMACS_SITE_LISPDIR%%/gnus/mml.el
-%%EMACS_SITE_LISPDIR%%/gnus/mml.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnagent.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnagent.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnbabyl.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnbabyl.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nndb.el
-%%EMACS_SITE_LISPDIR%%/gnus/nndb.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nndir.el
-%%EMACS_SITE_LISPDIR%%/gnus/nndir.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nndoc.el
-%%EMACS_SITE_LISPDIR%%/gnus/nndoc.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nndraft.el
-%%EMACS_SITE_LISPDIR%%/gnus/nndraft.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nneething.el
-%%EMACS_SITE_LISPDIR%%/gnus/nneething.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnfolder.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnfolder.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nngateway.el
-%%EMACS_SITE_LISPDIR%%/gnus/nngateway.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnheader.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnheader.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnheaderxm.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnimap.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnimap.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnkiboze.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnkiboze.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnlistserv.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnmail.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnmail.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnmbox.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnmbox.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnmh.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnmh.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnml.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnml.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnoo.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnoo.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnslashdot.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnsoup.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnsoup.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnspool.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnspool.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nntp.el
-%%EMACS_SITE_LISPDIR%%/gnus/nntp.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnultimate.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnvirtual.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnvirtual.elc
-%%EMACS_SITE_LISPDIR%%/gnus/nnwarchive.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnweb.el
-%%EMACS_SITE_LISPDIR%%/gnus/nnwfm.el
-%%EMACS_SITE_LISPDIR%%/gnus/parse-time.el
-%%EMACS_SITE_LISPDIR%%/gnus/parse-time.elc
-%%EMACS_SITE_LISPDIR%%/gnus/pop3.el
-%%EMACS_SITE_LISPDIR%%/gnus/pop3.elc
-%%EMACS_SITE_LISPDIR%%/gnus/qp.el
-%%EMACS_SITE_LISPDIR%%/gnus/qp.elc
-%%EMACS_SITE_LISPDIR%%/gnus/rfc1843.el
-%%EMACS_SITE_LISPDIR%%/gnus/rfc1843.elc
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2045.el
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2045.elc
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2047.el
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2047.elc
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2104.el
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2104.elc
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2231.el
-%%EMACS_SITE_LISPDIR%%/gnus/rfc2231.elc
-%%EMACS_SITE_LISPDIR%%/gnus/score-mode.el
-%%EMACS_SITE_LISPDIR%%/gnus/score-mode.elc
-%%EMACS_SITE_LISPDIR%%/gnus/smiley-ems.el
-%%EMACS_SITE_LISPDIR%%/gnus/smiley-ems.elc
-%%EMACS_SITE_LISPDIR%%/gnus/smiley.el
-%%EMACS_SITE_LISPDIR%%/gnus/starttls.el
-%%EMACS_SITE_LISPDIR%%/gnus/starttls.elc
-%%EMACS_SITE_LISPDIR%%/gnus/time-date.el
-%%EMACS_SITE_LISPDIR%%/gnus/time-date.elc
-%%EMACS_SITE_LISPDIR%%/gnus/utf7.el
-%%EMACS_SITE_LISPDIR%%/gnus/utf7.elc
-%%EMACS_SITE_LISPDIR%%/gnus/uudecode.el
-%%EMACS_SITE_LISPDIR%%/gnus/uudecode.elc
-%%EMACS_SITE_LISPDIR%%/gnus/webmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/base64.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/binhex.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/binhex.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/dgnushack.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/earcon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/earcon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/flow-fill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/flow-fill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/format-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/format-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-agent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-agent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-art.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-art.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-async.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-async.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-audio.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-audio.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-bcklg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-bcklg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cache.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cache.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cite.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cite.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-demon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-demon.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-draft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-draft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-dup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-dup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-eform.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-eform.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-ems.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-ems.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-gl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-gl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-group.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-group.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-int.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-int.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-kill.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-kill.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-load.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-load.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-logic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-logic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-mh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-mh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-ml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-ml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-mlspl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-mlspl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-move.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-move.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-msg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-msg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-nocem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-nocem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-picon.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-range.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-range.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-salt.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-salt.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-score.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-score.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-soup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-soup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-spec.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-spec.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-srvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-srvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-start.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-start.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-sum.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-sum.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-topic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-topic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-undo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-undo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-vm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-vm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-win.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-win.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus-xmas.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/gnus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/ietf-drums.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/ietf-drums.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/imap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/imap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/lpath.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-prsvr.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-prsvr.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-source.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mail-source.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mailcap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mailcap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/message.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/message.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/messagexmas.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/messcompat.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/messcompat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-bodies.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-bodies.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-uu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-uu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mm-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/mml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnagent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnagent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnbabyl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnbabyl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndir.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndir.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndoc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndoc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndraft.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nndraft.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nneething.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nneething.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnfolder.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnfolder.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nngateway.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nngateway.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnheader.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnheader.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnheaderxm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnimap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnimap.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnkiboze.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnkiboze.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnlistserv.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmail.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmail.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmbox.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmbox.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmh.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnmh.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnml.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnml.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnoo.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnoo.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnslashdot.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnsoup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnsoup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnspool.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnspool.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nntp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nntp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnultimate.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnvirtual.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnvirtual.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnwarchive.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnweb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/nnwfm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/parse-time.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/parse-time.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/pop3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/pop3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/qp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/qp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc1843.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc1843.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2045.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2045.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2047.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2047.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2104.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2104.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2231.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/rfc2231.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/score-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/score-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/smiley-ems.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/smiley-ems.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/smiley.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/starttls.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/starttls.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/time-date.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/time-date.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/utf7.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/utf7.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/uudecode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/uudecode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/gnus/webmail.el
 @unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
+@unexec test -f %D/%%INFODIR%%/emacs-mime && install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
 @unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
+@unexec test -f %D/%%INFODIR%%/gnus && install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
 @unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
+@unexec test -f %D/%%INFODIR%%/message && install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-mime.info
 %%INFODIR%%/gnus-1.info
 %%INFODIR%%/gnus-10.info
@@ -237,5 +240,5 @@
 share/doc/gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
 share/doc/gnus-%%EMACS_PORT_NAME%%/README
-@dirrm %%EMACS_SITE_LISPDIR%%/gnus
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/gnus
 @dirrm share/doc/gnus-%%EMACS_PORT_NAME%%