>Number:         22998
>Category:       pkg
>Synopsis:       pkgsrc mail/gnus installs info and pixmap files incorrectly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 28 22:21:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Wolfgang S. Rupprecht
>Release:        NetBSD 1.6L
>Organization:
W S Rupprecht Computer Consulting, Fremont CA
>Environment:
	
	
System: NetBSD capsicum.wsrcc.com 1.6L NetBSD 1.6L (WSRCC_ATHLON) #0: Sat Aug 30 09:46:07 PDT 2003 wolfgang@capsicum.wsrcc.com:/u/src/netbsd/src-20030118/src/sys/arch/i386/compile/WSRCC_ATHLON i386
Architecture: i386
Machine: i386
>Description:

	problem #1:

	Pkgsrc's mail/gnus installs gnu's info files in an out of the
	way directory that is not cataloged by emacs.

	> # Avoid conflicting with Emacsen provided gnus info files
	Emacs's info file is located in a version-numbered directory
	that would not have these files installed into it anyway.  The
	default gnus files for the current emacs are in:
        /usr/pkg/share/emacs/21.3/lisp/gnus/gnus.el

	problem #2:
	
	The gnu pixmaps are installed in a non-standard directory and
	emacs never finds them.

>How-To-Repeat:
	
	Install gnus; run "C-h i" to read the new info.  Select gnus.
	Notice that one is still reading the old info file.

	Run M-x gnus and notice that the color gnu image doesn't
	display.  Emacs falls back to using ascii graphics.

>Fix:
	
	Yes, I know the "etc/" pixmap under lispdir looks funny.
	Emacs expects the files here, so they need to go here.

	I removed the comment about "conflicting with emacs".  The
	site-lisp directory will never be in conflict with the base
	emacs.  This directory is solely for site-local files.

cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/gnus/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	2003/08/09 11:08:56	1.4
+++ Makefile	2003/09/28 22:08:32
@@ -13,12 +13,12 @@
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lispdir=${EMACS_LISPPREFIX}/gnus
-CONFIGURE_ARGS+=	--with-etcdir=${PREFIX}/share/gnus
-# Avoid conflicting with Emacsen provided gnus info files
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/share/doc/gnus/info
+CONFIGURE_ARGS+=	--with-etcdir=${EMACS_LISPPREFIX}/etc
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
 
+
 USE_MAKEINFO=		YES
-INFO_DIR=		share/doc/gnus/info
+INFO_DIR=		info
 INFO_FILES=		emacs-mime gnus message pgg sieve
 
 .include "../../mk/emacs.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/mail/gnus/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	2003/07/08 09:58:53	1.2
+++ PLIST	2003/09/28 22:08:33
@@ -1,174 +1,174 @@
 @comment $NetBSD: PLIST,v 1.2 2003/07/08 09:58:53 seb Exp $
-share/doc/gnus/info/emacs-mime
-share/doc/gnus/info/gnus
-share/doc/gnus/info/gnus-1
-share/doc/gnus/info/gnus-10
-share/doc/gnus/info/gnus-11
-share/doc/gnus/info/gnus-12
-share/doc/gnus/info/gnus-13
-share/doc/gnus/info/gnus-14
-share/doc/gnus/info/gnus-15
-share/doc/gnus/info/gnus-16
-share/doc/gnus/info/gnus-17
-share/doc/gnus/info/gnus-18
-share/doc/gnus/info/gnus-19
-share/doc/gnus/info/gnus-2
-share/doc/gnus/info/gnus-20
-share/doc/gnus/info/gnus-21
-share/doc/gnus/info/gnus-22
-share/doc/gnus/info/gnus-3
-share/doc/gnus/info/gnus-4
-share/doc/gnus/info/gnus-5
-share/doc/gnus/info/gnus-6
-share/doc/gnus/info/gnus-7
-share/doc/gnus/info/gnus-8
-share/doc/gnus/info/gnus-9
-share/doc/gnus/info/message
-share/doc/gnus/info/message-1
-share/doc/gnus/info/message-2
-share/doc/gnus/info/pgg
-share/doc/gnus/info/sieve
-share/gnus/gnus-tut.txt
-share/gnus/gnus/bar.xbm
-share/gnus/gnus/bar.xpm
-share/gnus/gnus/catchup.pbm
-share/gnus/gnus/catchup.xpm
-share/gnus/gnus/cu-exit.pbm
-share/gnus/gnus/cu-exit.xpm
-share/gnus/gnus/describe-group.pbm
-share/gnus/gnus/describe-group.xpm
-share/gnus/gnus/exit-gnus.pbm
-share/gnus/gnus/exit-gnus.xpm
-share/gnus/gnus/exit-summ.pbm
-share/gnus/gnus/exit-summ.xpm
-share/gnus/gnus/followup.pbm
-share/gnus/gnus/followup.xpm
-share/gnus/gnus/fuwo.pbm
-share/gnus/gnus/fuwo.xpm
-share/gnus/gnus/get-news.pbm
-share/gnus/gnus/get-news.xpm
-share/gnus/gnus/gnntg.pbm
-share/gnus/gnus/gnntg.xpm
-share/gnus/gnus/gnus-group-catchup-current-up.xbm
-share/gnus/gnus/gnus-group-catchup-current-up.xpm
-share/gnus/gnus/gnus-group-catchup-current.xbm
-share/gnus/gnus/gnus-group-catchup-current.xpm
-share/gnus/gnus/gnus-group-describe-group-up.xbm
-share/gnus/gnus/gnus-group-describe-group-up.xpm
-share/gnus/gnus/gnus-group-exit-up.xbm
-share/gnus/gnus/gnus-group-exit-up.xpm
-share/gnus/gnus/gnus-group-get-new-news-this-group-up.xbm
-share/gnus/gnus/gnus-group-get-new-news-this-group-up.xpm
-share/gnus/gnus/gnus-group-get-new-news-up.xbm
-share/gnus/gnus/gnus-group-get-new-news-up.xpm
-share/gnus/gnus/gnus-group-kill-group-up.xbm
-share/gnus/gnus/gnus-group-kill-group-up.xpm
-share/gnus/gnus/gnus-group-subscribe-up.xbm
-share/gnus/gnus/gnus-group-subscribe-up.xpm
-share/gnus/gnus/gnus-group-unsubscribe-up.xbm
-share/gnus/gnus/gnus-group-unsubscribe-up.xpm
-share/gnus/gnus/gnus-pointer.xbm
-share/gnus/gnus/gnus-pointer.xpm
-share/gnus/gnus/gnus-summary-caesar-message-up.xbm
-share/gnus/gnus/gnus-summary-caesar-message-up.xpm
-share/gnus/gnus/gnus-summary-cancel-article-up.xbm
-share/gnus/gnus/gnus-summary-cancel-article-up.xpm
-share/gnus/gnus/gnus-summary-catchup-and-exit-up.xbm
-share/gnus/gnus/gnus-summary-catchup-and-exit-up.xpm
-share/gnus/gnus/gnus-summary-catchup-up.xbm
-share/gnus/gnus/gnus-summary-catchup-up.xpm
-share/gnus/gnus/gnus-summary-exit-up.xbm
-share/gnus/gnus/gnus-summary-exit-up.xpm
-share/gnus/gnus/gnus-summary-followup-up.xbm
-share/gnus/gnus/gnus-summary-followup-up.xpm
-share/gnus/gnus/gnus-summary-followup-with-original-up.xbm
-share/gnus/gnus/gnus-summary-followup-with-original-up.xpm
-share/gnus/gnus/gnus-summary-mail-copy-up.xbm
-share/gnus/gnus/gnus-summary-mail-copy-up.xpm
-share/gnus/gnus/gnus-summary-mail-delete-up.xbm
-share/gnus/gnus/gnus-summary-mail-delete-up.xpm
-share/gnus/gnus/gnus-summary-mail-forward-up.xbm
-share/gnus/gnus/gnus-summary-mail-forward-up.xpm
-share/gnus/gnus/gnus-summary-mail-get-up.xbm
-share/gnus/gnus/gnus-summary-mail-get-up.xpm
-share/gnus/gnus/gnus-summary-mail-originate-up.xbm
-share/gnus/gnus/gnus-summary-mail-originate-up.xpm
-share/gnus/gnus/gnus-summary-mail-reply-up.xbm
-share/gnus/gnus/gnus-summary-mail-reply-up.xpm
-share/gnus/gnus/gnus-summary-mail-save-up.xbm
-share/gnus/gnus/gnus-summary-mail-save-up.xpm
-share/gnus/gnus/gnus-summary-next-unread-up.xbm
-share/gnus/gnus/gnus-summary-next-unread-up.xpm
-share/gnus/gnus/gnus-summary-post-news-up.xbm
-share/gnus/gnus/gnus-summary-post-news-up.xpm
-share/gnus/gnus/gnus-summary-prev-unread-up.xbm
-share/gnus/gnus/gnus-summary-prev-unread-up.xpm
-share/gnus/gnus/gnus-summary-reply-up.xbm
-share/gnus/gnus/gnus-summary-reply-up.xpm
-share/gnus/gnus/gnus-summary-reply-with-original-up.xbm
-share/gnus/gnus/gnus-summary-reply-with-original-up.xpm
-share/gnus/gnus/gnus-summary-save-article-file-up.xbm
-share/gnus/gnus/gnus-summary-save-article-file-up.xpm
-share/gnus/gnus/gnus-summary-save-article-up.xbm
-share/gnus/gnus/gnus-summary-save-article-up.xpm
-share/gnus/gnus/gnus-uu-decode-uu-up.xbm
-share/gnus/gnus/gnus-uu-decode-uu-up.xpm
-share/gnus/gnus/gnus-uu-post-news-up.xbm
-share/gnus/gnus/gnus-uu-post-news-up.xpm
-share/gnus/gnus/gnus.xbm
-share/gnus/gnus/gnus.xpm
-share/gnus/gnus/important.xpm
-share/gnus/gnus/kill-group.pbm
-share/gnus/gnus/kill-group.xpm
-share/gnus/gnus/mail-reply.pbm
-share/gnus/gnus/mail-reply.xpm
-share/gnus/gnus/next-ur.pbm
-share/gnus/gnus/next-ur.xpm
-share/gnus/gnus/post.pbm
-share/gnus/gnus/post.xpm
-share/gnus/gnus/prev-ur.pbm
-share/gnus/gnus/prev-ur.xpm
-share/gnus/gnus/preview.xbm
-share/gnus/gnus/preview.xpm
-share/gnus/gnus/receipt.xpm
-share/gnus/gnus/reply-wo.pbm
-share/gnus/gnus/reply-wo.xpm
-share/gnus/gnus/reply.pbm
-share/gnus/gnus/reply.xpm
-share/gnus/gnus/rot13.pbm
-share/gnus/gnus/rot13.xpm
-share/gnus/gnus/save-aif.pbm
-share/gnus/gnus/save-aif.xpm
-share/gnus/gnus/save-art.pbm
-share/gnus/gnus/save-art.xpm
-share/gnus/gnus/subscribe.pbm
-share/gnus/gnus/subscribe.xpm
-share/gnus/gnus/unimportant.xpm
-share/gnus/gnus/unsubscribe.pbm
-share/gnus/gnus/unsubscribe.xpm
-share/gnus/gnus/uu-decode.pbm
-share/gnus/gnus/uu-decode.xpm
-share/gnus/gnus/uu-post.pbm
-share/gnus/gnus/uu-post.xpm
-share/gnus/gnus/x-splash
-share/gnus/smilies/blink.pbm
-share/gnus/smilies/blink.xpm
-share/gnus/smilies/braindamaged.xpm
-share/gnus/smilies/cry.xpm
-share/gnus/smilies/dead.xpm
-share/gnus/smilies/evil.xpm
-share/gnus/smilies/forced.xpm
-share/gnus/smilies/frown.pbm
-share/gnus/smilies/frown.xpm
-share/gnus/smilies/grin.xpm
-share/gnus/smilies/indifferent.xpm
-share/gnus/smilies/reverse-smile.xpm
-share/gnus/smilies/sad.pbm
-share/gnus/smilies/sad.xpm
-share/gnus/smilies/smile.pbm
-share/gnus/smilies/smile.xpm
-share/gnus/smilies/wry.pbm
-share/gnus/smilies/wry.xpm
+info/emacs-mime
+info/gnus
+info/gnus-1
+info/gnus-10
+info/gnus-11
+info/gnus-12
+info/gnus-13
+info/gnus-14
+info/gnus-15
+info/gnus-16
+info/gnus-17
+info/gnus-18
+info/gnus-19
+info/gnus-2
+info/gnus-20
+info/gnus-21
+info/gnus-22
+info/gnus-3
+info/gnus-4
+info/gnus-5
+info/gnus-6
+info/gnus-7
+info/gnus-8
+info/gnus-9
+info/message
+info/message-1
+info/message-2
+info/pgg
+info/sieve
+${EMACS_LISPPREFIX}/etc/gnus-tut.txt
+${EMACS_LISPPREFIX}/etc/gnus/bar.xbm
+${EMACS_LISPPREFIX}/etc/gnus/bar.xpm
+${EMACS_LISPPREFIX}/etc/gnus/catchup.pbm
+${EMACS_LISPPREFIX}/etc/gnus/catchup.xpm
+${EMACS_LISPPREFIX}/etc/gnus/cu-exit.pbm
+${EMACS_LISPPREFIX}/etc/gnus/cu-exit.xpm
+${EMACS_LISPPREFIX}/etc/gnus/describe-group.pbm
+${EMACS_LISPPREFIX}/etc/gnus/describe-group.xpm
+${EMACS_LISPPREFIX}/etc/gnus/exit-gnus.pbm
+${EMACS_LISPPREFIX}/etc/gnus/exit-gnus.xpm
+${EMACS_LISPPREFIX}/etc/gnus/exit-summ.pbm
+${EMACS_LISPPREFIX}/etc/gnus/exit-summ.xpm
+${EMACS_LISPPREFIX}/etc/gnus/followup.pbm
+${EMACS_LISPPREFIX}/etc/gnus/followup.xpm
+${EMACS_LISPPREFIX}/etc/gnus/fuwo.pbm
+${EMACS_LISPPREFIX}/etc/gnus/fuwo.xpm
+${EMACS_LISPPREFIX}/etc/gnus/get-news.pbm
+${EMACS_LISPPREFIX}/etc/gnus/get-news.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnntg.pbm
+${EMACS_LISPPREFIX}/etc/gnus/gnntg.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-catchup-current-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-catchup-current-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-catchup-current.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-catchup-current.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-describe-group-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-describe-group-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-exit-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-exit-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-get-new-news-this-group-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-get-new-news-this-group-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-get-new-news-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-get-new-news-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-kill-group-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-kill-group-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-subscribe-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-subscribe-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-unsubscribe-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-group-unsubscribe-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-pointer.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-pointer.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-caesar-message-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-caesar-message-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-cancel-article-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-cancel-article-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-catchup-and-exit-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-catchup-and-exit-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-catchup-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-catchup-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-exit-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-exit-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-followup-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-followup-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-followup-with-original-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-followup-with-original-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-copy-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-copy-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-delete-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-delete-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-forward-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-forward-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-get-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-get-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-originate-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-originate-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-reply-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-reply-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-save-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-mail-save-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-next-unread-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-next-unread-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-post-news-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-post-news-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-prev-unread-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-prev-unread-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-reply-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-reply-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-reply-with-original-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-reply-with-original-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-save-article-file-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-save-article-file-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-save-article-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-summary-save-article-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-uu-decode-uu-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-uu-decode-uu-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-uu-post-news-up.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus-uu-post-news-up.xpm
+${EMACS_LISPPREFIX}/etc/gnus/gnus.xbm
+${EMACS_LISPPREFIX}/etc/gnus/gnus.xpm
+${EMACS_LISPPREFIX}/etc/gnus/important.xpm
+${EMACS_LISPPREFIX}/etc/gnus/kill-group.pbm
+${EMACS_LISPPREFIX}/etc/gnus/kill-group.xpm
+${EMACS_LISPPREFIX}/etc/gnus/mail-reply.pbm
+${EMACS_LISPPREFIX}/etc/gnus/mail-reply.xpm
+${EMACS_LISPPREFIX}/etc/gnus/next-ur.pbm
+${EMACS_LISPPREFIX}/etc/gnus/next-ur.xpm
+${EMACS_LISPPREFIX}/etc/gnus/post.pbm
+${EMACS_LISPPREFIX}/etc/gnus/post.xpm
+${EMACS_LISPPREFIX}/etc/gnus/prev-ur.pbm
+${EMACS_LISPPREFIX}/etc/gnus/prev-ur.xpm
+${EMACS_LISPPREFIX}/etc/gnus/preview.xbm
+${EMACS_LISPPREFIX}/etc/gnus/preview.xpm
+${EMACS_LISPPREFIX}/etc/gnus/receipt.xpm
+${EMACS_LISPPREFIX}/etc/gnus/reply-wo.pbm
+${EMACS_LISPPREFIX}/etc/gnus/reply-wo.xpm
+${EMACS_LISPPREFIX}/etc/gnus/reply.pbm
+${EMACS_LISPPREFIX}/etc/gnus/reply.xpm
+${EMACS_LISPPREFIX}/etc/gnus/rot13.pbm
+${EMACS_LISPPREFIX}/etc/gnus/rot13.xpm
+${EMACS_LISPPREFIX}/etc/gnus/save-aif.pbm
+${EMACS_LISPPREFIX}/etc/gnus/save-aif.xpm
+${EMACS_LISPPREFIX}/etc/gnus/save-art.pbm
+${EMACS_LISPPREFIX}/etc/gnus/save-art.xpm
+${EMACS_LISPPREFIX}/etc/gnus/subscribe.pbm
+${EMACS_LISPPREFIX}/etc/gnus/subscribe.xpm
+${EMACS_LISPPREFIX}/etc/gnus/unimportant.xpm
+${EMACS_LISPPREFIX}/etc/gnus/unsubscribe.pbm
+${EMACS_LISPPREFIX}/etc/gnus/unsubscribe.xpm
+${EMACS_LISPPREFIX}/etc/gnus/uu-decode.pbm
+${EMACS_LISPPREFIX}/etc/gnus/uu-decode.xpm
+${EMACS_LISPPREFIX}/etc/gnus/uu-post.pbm
+${EMACS_LISPPREFIX}/etc/gnus/uu-post.xpm
+${EMACS_LISPPREFIX}/etc/gnus/x-splash
+${EMACS_LISPPREFIX}/etc/smilies/blink.pbm
+${EMACS_LISPPREFIX}/etc/smilies/blink.xpm
+${EMACS_LISPPREFIX}/etc/smilies/braindamaged.xpm
+${EMACS_LISPPREFIX}/etc/smilies/cry.xpm
+${EMACS_LISPPREFIX}/etc/smilies/dead.xpm
+${EMACS_LISPPREFIX}/etc/smilies/evil.xpm
+${EMACS_LISPPREFIX}/etc/smilies/forced.xpm
+${EMACS_LISPPREFIX}/etc/smilies/frown.pbm
+${EMACS_LISPPREFIX}/etc/smilies/frown.xpm
+${EMACS_LISPPREFIX}/etc/smilies/grin.xpm
+${EMACS_LISPPREFIX}/etc/smilies/indifferent.xpm
+${EMACS_LISPPREFIX}/etc/smilies/reverse-smile.xpm
+${EMACS_LISPPREFIX}/etc/smilies/sad.pbm
+${EMACS_LISPPREFIX}/etc/smilies/sad.xpm
+${EMACS_LISPPREFIX}/etc/smilies/smile.pbm
+${EMACS_LISPPREFIX}/etc/smilies/smile.xpm
+${EMACS_LISPPREFIX}/etc/smilies/wry.pbm
+${EMACS_LISPPREFIX}/etc/smilies/wry.xpm
 ${EMACS_LISPPREFIX}/gnus/binhex.el
 ${EMACS_LISPPREFIX}/gnus/binhex.elc
 ${EMACS_LISPPREFIX}/gnus/canlock.el
@@ -453,6 +453,6 @@
 ${EMACS_LISPPREFIX}/gnus/yenc.elc
 @dirrm share/doc/gnus/info
 @dirrm share/doc/gnus
-@dirrm share/gnus/smilies
-@dirrm share/gnus/gnus
+@dirrm ${EMACS_LISPPREFIX}/etc/smilies
+@dirrm ${EMACS_LISPPREFIX}/etc/gnus
 @dirrm share/gnus

>Release-Note:
>Audit-Trail:
>Unformatted: