Port to Emacs-21, using emacs.mk.

2 files changed, 218 insertions, 128 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index ab6382e4d57..d85ef35d993 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:29 seb Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/22 15:11:40 minoura Exp $
 
 DISTNAME=	wl-2.8.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
 
@@ -8,11 +9,24 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	mail/news management system with IMAP4rev1 support for Emacs
 
-DEPENDS+=	semi>=1.13.7:../../devel/semi
+DEPENDS+=	${PKGNAME_PREFIX}semi>=1.13.7:../../devel/semi
+# XXX please someone adjust paths and PLIST for XEmacs...
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs20
 
 INSTALL_TARGET=	install install-info
 INFO_FILES=	wl.info wl-ja.info
 
+.include "../../mk/emacs.mk"
+
+.ifdef ${EMACS_FLAVOR} == "emacs"
+ETCDIR=		share/emacs/${EMACS_VERSION}/etc/wl
+.else
+# XXX where to go?
+.endif
+ICONDIR=	${ETCDIR}/icons
+PLIST_SUBST+=	ETCDIR=${ETCDIR}
+PLIST_SUBST+=	ICONDIR=${ICONDIR}
+
 DOCDIR=		${PREFIX}/share/doc/wl
 EXAMPLESDIR=	${PREFIX}/share/examples/wl
 DOCS=		BUGS NEWS README
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index edef0d8b2d5..a331b082c86 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/08 11:47:16 jun Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/22 15:11:40 minoura Exp $
+@unexec ${INSTALL_INFO} --delete %D/info/wl.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/wl-ja.info %D/info/dir
+info/wl.info
+info/wl-ja.info
+@exec ${INSTALL_INFO} %D/info/wl.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/wl-ja.info %D/info/dir
 share/doc/wl/en/BUGS
 share/doc/wl/en/NEWS
 share/doc/wl/en/README
@@ -6,140 +12,210 @@ share/doc/wl/ja/BUGS.ja
 share/doc/wl/ja/NEWS.ja
 share/doc/wl/ja/README.ja
 share/doc/wl/ja/TODO.ja
-share/emacs/20.7/etc/wl/icons/wl-alpha-logo.img
-share/emacs/20.7/etc/wl/icons/wl-alpha-logo.xbm
-share/emacs/20.7/etc/wl/icons/wl-alpha-xmas-logo.img
-share/emacs/20.7/etc/wl/icons/wl-alpha-xmas-logo.xbm
-share/emacs/20.7/etc/wl/icons/wl-beta-logo.img
-share/emacs/20.7/etc/wl/icons/wl-beta-logo.xbm
-share/emacs/20.7/etc/wl/icons/wl-beta-xmas-logo.img
-share/emacs/20.7/etc/wl/icons/wl-beta-xmas-logo.xbm
-share/emacs/20.7/etc/wl/icons/wl-stable-logo.img
-share/emacs/20.7/etc/wl/icons/wl-stable-logo.xbm
-share/emacs/20.7/etc/wl/icons/wl-stable-xmas-logo.img
-share/emacs/20.7/etc/wl/icons/wl-stable-xmas-logo.xbm
-share/emacs/site-lisp/wl/acap.elc
-share/emacs/site-lisp/wl/acap.el
-share/emacs/site-lisp/wl/elmo-archive.elc
-share/emacs/site-lisp/wl/elmo-archive.el
-share/emacs/site-lisp/wl/elmo-cache.elc
-share/emacs/site-lisp/wl/elmo-cache.el
-share/emacs/site-lisp/wl/elmo-date.elc
-share/emacs/site-lisp/wl/elmo-date.el
-share/emacs/site-lisp/wl/elmo-dop.elc
-share/emacs/site-lisp/wl/elmo-dop.el
-share/emacs/site-lisp/wl/elmo-filter.elc
-share/emacs/site-lisp/wl/elmo-filter.el
-share/emacs/site-lisp/wl/elmo-imap4.elc
-share/emacs/site-lisp/wl/elmo-imap4.el
-share/emacs/site-lisp/wl/elmo-internal.elc
-share/emacs/site-lisp/wl/elmo-internal.el
-share/emacs/site-lisp/wl/elmo-localdir.elc
-share/emacs/site-lisp/wl/elmo-localdir.el
-share/emacs/site-lisp/wl/elmo-localnews.elc
-share/emacs/site-lisp/wl/elmo-localnews.el
-share/emacs/site-lisp/wl/elmo-maildir.elc
-share/emacs/site-lisp/wl/elmo-maildir.el
-share/emacs/site-lisp/wl/elmo-map.elc
-share/emacs/site-lisp/wl/elmo-map.el
-share/emacs/site-lisp/wl/elmo-mark.elc
-share/emacs/site-lisp/wl/elmo-mark.el
-share/emacs/site-lisp/wl/elmo-mime.elc
-share/emacs/site-lisp/wl/elmo-mime.el
-share/emacs/site-lisp/wl/elmo-msgdb.elc
-share/emacs/site-lisp/wl/elmo-msgdb.el
-share/emacs/site-lisp/wl/elmo-multi.elc
-share/emacs/site-lisp/wl/elmo-multi.el
-share/emacs/site-lisp/wl/elmo-net.elc
-share/emacs/site-lisp/wl/elmo-net.el
-share/emacs/site-lisp/wl/elmo-nmz.elc
-share/emacs/site-lisp/wl/elmo-nmz.el
-share/emacs/site-lisp/wl/elmo-nntp.elc
-share/emacs/site-lisp/wl/elmo-nntp.el
-share/emacs/site-lisp/wl/elmo-pipe.elc
-share/emacs/site-lisp/wl/elmo-pipe.el
-share/emacs/site-lisp/wl/elmo-pop3.elc
-share/emacs/site-lisp/wl/elmo-pop3.el
-share/emacs/site-lisp/wl/elmo-sendlog.elc
-share/emacs/site-lisp/wl/elmo-sendlog.el
-share/emacs/site-lisp/wl/elmo-util.elc
-share/emacs/site-lisp/wl/elmo-util.el
-share/emacs/site-lisp/wl/elmo-vars.elc
-share/emacs/site-lisp/wl/elmo-vars.el
-share/emacs/site-lisp/wl/elmo-version.elc
-share/emacs/site-lisp/wl/elmo-version.el
-share/emacs/site-lisp/wl/elmo.elc
-share/emacs/site-lisp/wl/elmo.el
-share/emacs/site-lisp/wl/mmimap.elc
-share/emacs/site-lisp/wl/mmimap.el
-share/emacs/site-lisp/wl/pldap.elc
-share/emacs/site-lisp/wl/pldap.el
-share/emacs/site-lisp/wl/rfc2368.elc
-share/emacs/site-lisp/wl/rfc2368.el
-share/emacs/site-lisp/wl/slp.elc
-share/emacs/site-lisp/wl/slp.el
-share/emacs/site-lisp/wl/ssl.elc
-share/emacs/site-lisp/wl/ssl.el
-share/emacs/site-lisp/wl/utf7.elc
-share/emacs/site-lisp/wl/utf7.el
-share/emacs/site-lisp/wl/wl-acap.elc
-share/emacs/site-lisp/wl/wl-acap.el
-share/emacs/site-lisp/wl/wl-addrbook.elc
-share/emacs/site-lisp/wl/wl-addrbook.el
-share/emacs/site-lisp/wl/wl-address.elc
-share/emacs/site-lisp/wl/wl-address.el
-share/emacs/site-lisp/wl/wl-addrmgr.elc
-share/emacs/site-lisp/wl/wl-addrmgr.el
-share/emacs/site-lisp/wl/wl-complete.elc
-share/emacs/site-lisp/wl/wl-complete.el
-share/emacs/site-lisp/wl/wl-demo.elc
-share/emacs/site-lisp/wl/wl-demo.el
-share/emacs/site-lisp/wl/wl-draft.elc
-share/emacs/site-lisp/wl/wl-draft.el
-share/emacs/site-lisp/wl/wl-expire.elc
-share/emacs/site-lisp/wl/wl-expire.el
-share/emacs/site-lisp/wl/wl-fldmgr.elc
-share/emacs/site-lisp/wl/wl-fldmgr.el
-share/emacs/site-lisp/wl/wl-folder.elc
-share/emacs/site-lisp/wl/wl-folder.el
-share/emacs/site-lisp/wl/wl-highlight.elc
-share/emacs/site-lisp/wl/wl-highlight.el
-share/emacs/site-lisp/wl/wl-mailto.elc
-share/emacs/site-lisp/wl/wl-mailto.el
-share/emacs/site-lisp/wl/wl-message.elc
-share/emacs/site-lisp/wl/wl-message.el
-share/emacs/site-lisp/wl/wl-mime.elc
-share/emacs/site-lisp/wl/wl-mime.el
-share/emacs/site-lisp/wl/wl-mule.elc
-share/emacs/site-lisp/wl/wl-mule.el
-share/emacs/site-lisp/wl/wl-refile.elc
-share/emacs/site-lisp/wl/wl-refile.el
-share/emacs/site-lisp/wl/wl-score.elc
-share/emacs/site-lisp/wl/wl-score.el
-share/emacs/site-lisp/wl/wl-summary.elc
-share/emacs/site-lisp/wl/wl-summary.el
-share/emacs/site-lisp/wl/wl-template.elc
-share/emacs/site-lisp/wl/wl-template.el
-share/emacs/site-lisp/wl/wl-thread.elc
-share/emacs/site-lisp/wl/wl-thread.el
-share/emacs/site-lisp/wl/wl-util.elc
-share/emacs/site-lisp/wl/wl-util.el
-share/emacs/site-lisp/wl/wl-vars.elc
-share/emacs/site-lisp/wl/wl-vars.el
-share/emacs/site-lisp/wl/wl-version.elc
-share/emacs/site-lisp/wl/wl-version.el
-share/emacs/site-lisp/wl/wl.elc
-share/emacs/site-lisp/wl/wl.el
+${FOR_emacs21}${ICONDIR}/archive.xpm
+${FOR_emacs21}${ICONDIR}/closed.xpm
+${FOR_emacs21}${ICONDIR}/draft.xpm
+${FOR_emacs21}${ICONDIR}/elmo.xpm
+${FOR_emacs21}${ICONDIR}/filter.xpm
+${FOR_emacs21}${ICONDIR}/imap.xpm
+${FOR_emacs21}${ICONDIR}/internal.xpm
+${FOR_emacs21}${ICONDIR}/letter.xpm
+${FOR_emacs21}${ICONDIR}/local.xpm
+${FOR_emacs21}${ICONDIR}/localnews.xpm
+${FOR_emacs21}${ICONDIR}/maildir.xpm
+${FOR_emacs21}${ICONDIR}/multi.xpm
+${FOR_emacs21}${ICONDIR}/news.xpm
+${FOR_emacs21}${ICONDIR}/nmz.xpm
+${FOR_emacs21}${ICONDIR}/no-letter.xpm
+${FOR_emacs21}${ICONDIR}/opened.xpm
+${FOR_emacs21}${ICONDIR}/pipe.xpm
+${FOR_emacs21}${ICONDIR}/plugged.xpm
+${FOR_emacs21}${ICONDIR}/pop.xpm
+${FOR_emacs21}${ICONDIR}/queue.xpm
+${FOR_emacs21}${ICONDIR}/shimbun.xpm
+${FOR_emacs21}${ICONDIR}/trash-e.xpm
+${FOR_emacs21}${ICONDIR}/trash.xpm
+${FOR_emacs21}${ICONDIR}/unplugged.xpm
+${ICONDIR}/wl-alpha-logo.img
+${ICONDIR}/wl-alpha-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-alpha-logo.xpm
+${ICONDIR}/wl-alpha-xmas-logo.img
+${ICONDIR}/wl-alpha-xmas-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-alpha-xmas-logo.xpm
+${ICONDIR}/wl-beta-logo.img
+${ICONDIR}/wl-beta-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-beta-logo.xpm
+${ICONDIR}/wl-beta-xmas-logo.img
+${ICONDIR}/wl-beta-xmas-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-beta-xmas-logo.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-insert-signature-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-kill-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-send-from-toolbar-down.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-send-from-toolbar-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-draft-yank-original-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-exit-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-check-current-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-empty-trash-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-jump-to-current-entity-no-sync-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-jump-to-current-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-next-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-prev-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-read-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-select-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-sync-current-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-folder-zoom-entity-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-extract-content-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-next-content-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-play-content-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-prev-content-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-quit-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-message-read-up.xpm
+${ICONDIR}/wl-stable-logo.img
+${ICONDIR}/wl-stable-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-stable-logo.xpm
+${ICONDIR}/wl-stable-xmas-logo.img
+${ICONDIR}/wl-stable-xmas-logo.xbm
+${FOR_emacs21}${ICONDIR}/wl-stable-xmas-logo.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-delete-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-exit-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-forward-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-jump-to-current-message-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-mark-as-important-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-next-page-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-next-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-prev-page-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-prev-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-read-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-reply-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-reply-with-citation-up.xpm
+${FOR_emacs21}${ICONDIR}/wl-summary-sync-force-update-up.xpm
+${EMACS_LISPPREFIX}/wl/acap.elc
+${EMACS_LISPPREFIX}/wl/acap.el
+${EMACS_LISPPREFIX}/wl/elmo-archive.elc
+${EMACS_LISPPREFIX}/wl/elmo-archive.el
+${EMACS_LISPPREFIX}/wl/elmo-cache.elc
+${EMACS_LISPPREFIX}/wl/elmo-cache.el
+${EMACS_LISPPREFIX}/wl/elmo-date.elc
+${EMACS_LISPPREFIX}/wl/elmo-date.el
+${EMACS_LISPPREFIX}/wl/elmo-dop.elc
+${EMACS_LISPPREFIX}/wl/elmo-dop.el
+${EMACS_LISPPREFIX}/wl/elmo-filter.elc
+${EMACS_LISPPREFIX}/wl/elmo-filter.el
+${EMACS_LISPPREFIX}/wl/elmo-imap4.elc
+${EMACS_LISPPREFIX}/wl/elmo-imap4.el
+${EMACS_LISPPREFIX}/wl/elmo-internal.elc
+${EMACS_LISPPREFIX}/wl/elmo-internal.el
+${EMACS_LISPPREFIX}/wl/elmo-localdir.elc
+${EMACS_LISPPREFIX}/wl/elmo-localdir.el
+${EMACS_LISPPREFIX}/wl/elmo-localnews.elc
+${EMACS_LISPPREFIX}/wl/elmo-localnews.el
+${EMACS_LISPPREFIX}/wl/elmo-maildir.elc
+${EMACS_LISPPREFIX}/wl/elmo-maildir.el
+${EMACS_LISPPREFIX}/wl/elmo-map.elc
+${EMACS_LISPPREFIX}/wl/elmo-map.el
+${EMACS_LISPPREFIX}/wl/elmo-mark.elc
+${EMACS_LISPPREFIX}/wl/elmo-mark.el
+${EMACS_LISPPREFIX}/wl/elmo-mime.elc
+${EMACS_LISPPREFIX}/wl/elmo-mime.el
+${EMACS_LISPPREFIX}/wl/elmo-msgdb.elc
+${EMACS_LISPPREFIX}/wl/elmo-msgdb.el
+${EMACS_LISPPREFIX}/wl/elmo-multi.elc
+${EMACS_LISPPREFIX}/wl/elmo-multi.el
+${EMACS_LISPPREFIX}/wl/elmo-net.elc
+${EMACS_LISPPREFIX}/wl/elmo-net.el
+${EMACS_LISPPREFIX}/wl/elmo-nmz.elc
+${EMACS_LISPPREFIX}/wl/elmo-nmz.el
+${EMACS_LISPPREFIX}/wl/elmo-nntp.elc
+${EMACS_LISPPREFIX}/wl/elmo-nntp.el
+${EMACS_LISPPREFIX}/wl/elmo-pipe.elc
+${EMACS_LISPPREFIX}/wl/elmo-pipe.el
+${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
+${EMACS_LISPPREFIX}/wl/elmo-pop3.el
+${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc
+${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
+${EMACS_LISPPREFIX}/wl/elmo-util.elc
+${EMACS_LISPPREFIX}/wl/elmo-util.el
+${EMACS_LISPPREFIX}/wl/elmo-vars.elc
+${EMACS_LISPPREFIX}/wl/elmo-vars.el
+${EMACS_LISPPREFIX}/wl/elmo-version.elc
+${EMACS_LISPPREFIX}/wl/elmo-version.el
+${EMACS_LISPPREFIX}/wl/elmo.elc
+${EMACS_LISPPREFIX}/wl/elmo.el
+${EMACS_LISPPREFIX}/wl/mmimap.elc
+${EMACS_LISPPREFIX}/wl/mmimap.el
+${EMACS_LISPPREFIX}/wl/pldap.elc
+${EMACS_LISPPREFIX}/wl/pldap.el
+${EMACS_LISPPREFIX}/wl/rfc2368.elc
+${EMACS_LISPPREFIX}/wl/rfc2368.el
+${EMACS_LISPPREFIX}/wl/slp.elc
+${EMACS_LISPPREFIX}/wl/slp.el
+${EMACS_LISPPREFIX}/wl/ssl.elc
+${EMACS_LISPPREFIX}/wl/ssl.el
+${EMACS_LISPPREFIX}/wl/utf7.elc
+${EMACS_LISPPREFIX}/wl/utf7.el
+${EMACS_LISPPREFIX}/wl/wl-acap.elc
+${EMACS_LISPPREFIX}/wl/wl-acap.el
+${EMACS_LISPPREFIX}/wl/wl-addrbook.elc
+${EMACS_LISPPREFIX}/wl/wl-addrbook.el
+${EMACS_LISPPREFIX}/wl/wl-address.elc
+${EMACS_LISPPREFIX}/wl/wl-address.el
+${EMACS_LISPPREFIX}/wl/wl-addrmgr.elc
+${EMACS_LISPPREFIX}/wl/wl-addrmgr.el
+${EMACS_LISPPREFIX}/wl/wl-complete.elc
+${EMACS_LISPPREFIX}/wl/wl-complete.el
+${EMACS_LISPPREFIX}/wl/wl-demo.elc
+${EMACS_LISPPREFIX}/wl/wl-demo.el
+${EMACS_LISPPREFIX}/wl/wl-draft.elc
+${EMACS_LISPPREFIX}/wl/wl-draft.el
+${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs21}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${EMACS_LISPPREFIX}/wl/wl-expire.elc
+${EMACS_LISPPREFIX}/wl/wl-expire.el
+${EMACS_LISPPREFIX}/wl/wl-fldmgr.elc
+${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
+${EMACS_LISPPREFIX}/wl/wl-folder.elc
+${EMACS_LISPPREFIX}/wl/wl-folder.el
+${EMACS_LISPPREFIX}/wl/wl-highlight.elc
+${EMACS_LISPPREFIX}/wl/wl-highlight.el
+${EMACS_LISPPREFIX}/wl/wl-mailto.elc
+${EMACS_LISPPREFIX}/wl/wl-mailto.el
+${EMACS_LISPPREFIX}/wl/wl-message.elc
+${EMACS_LISPPREFIX}/wl/wl-message.el
+${EMACS_LISPPREFIX}/wl/wl-mime.elc
+${EMACS_LISPPREFIX}/wl/wl-mime.el
+${FOR_emacs20}${EMACS_LISPPREFIX}/wl/wl-mule.elc
+${FOR_emacs20}${EMACS_LISPPREFIX}/wl/wl-mule.el
+${EMACS_LISPPREFIX}/wl/wl-refile.elc
+${EMACS_LISPPREFIX}/wl/wl-refile.el
+${EMACS_LISPPREFIX}/wl/wl-score.elc
+${EMACS_LISPPREFIX}/wl/wl-score.el
+${EMACS_LISPPREFIX}/wl/wl-summary.elc
+${EMACS_LISPPREFIX}/wl/wl-summary.el
+${EMACS_LISPPREFIX}/wl/wl-template.elc
+${EMACS_LISPPREFIX}/wl/wl-template.el
+${EMACS_LISPPREFIX}/wl/wl-thread.elc
+${EMACS_LISPPREFIX}/wl/wl-thread.el
+${EMACS_LISPPREFIX}/wl/wl-util.elc
+${EMACS_LISPPREFIX}/wl/wl-util.el
+${EMACS_LISPPREFIX}/wl/wl-vars.elc
+${EMACS_LISPPREFIX}/wl/wl-vars.el
+${EMACS_LISPPREFIX}/wl/wl-version.elc
+${EMACS_LISPPREFIX}/wl/wl-version.el
+${EMACS_LISPPREFIX}/wl/wl.elc
+${EMACS_LISPPREFIX}/wl/wl.el
 share/examples/wl/en/dot.addresses
 share/examples/wl/en/dot.folders
 share/examples/wl/en/dot.wl
 share/examples/wl/ja/dot.addresses
 share/examples/wl/ja/dot.folders
 share/examples/wl/ja/dot.wl
+@dirrm ${ICONDIR}
+@dirrm ${ETCDIR}
+@dirrm ${EMACS_LISPPREFIX}/wl
 @dirrm share/examples/wl/ja
 @dirrm share/examples/wl/en
 @dirrm share/examples/wl
-@dirrm share/emacs/site-lisp/wl
 @dirrm share/doc/wl/ja
 @dirrm share/doc/wl/en
 @dirrm share/doc/wl