--- gcl-2.6.7-r3.ebuild	2007-09-04 13:21:56.000000000 +0200
+++ /home/fauli/gcl-2.6.7-r3.ebuild	2007-10-04 19:54:33.000000000 +0200
@@ -57,7 +57,7 @@
 		$(use_enable ansi ansi)
 		--enable-xdr=no
 		--enable-infodir=/usr/share/info
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
+		--enable-emacsdir=${SITELISP}/${PN}"
 	einfo "Configuring with the following:
 ${myconfig}"
 	econf ${myconfig}
@@ -71,15 +71,19 @@
 	make DESTDIR="${D}" install || die "make install failed"
 
 	rm -rf ${D}/usr/lib/${P}/info
-	mv ${D}/default.el elisp/
 
 	if use emacs; then
-		mv elisp/add-default.el ${T}/50gcl-gentoo.el
-		elisp-site-file-install ${T}/50gcl-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
+		# do compilation here because some files are only
+		# available after make install
+		cd elisp
+		mv add-default.el "${S}/50gcl-gentoo.el"
+		elisp-compile *.el
+		elisp-install ${PN} * || die
+		elisp-site-file-install "${S}/50gcl-gentoo.el" || die
+		fperms 0644 "${SITELISP}"/${PN}/*
+		cd -
 	else
-		rm -rf ${D}/usr/share/emacs
+		rm -rf "${D}/usr/share/emacs"
 	fi
 
 	dosed /usr/bin/gcl