--- aclocal.m4~	2004-05-20 08:02:34 +0000
+++ aclocal.m4	2005-09-30 01:14:57 +0000
@@ -87,7 +87,7 @@
         datadir="\$(prefix)/lib"
         lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus"
     else
-    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus"
     fi
     for thedir in share lib; do
 	potential=
@@ -95,7 +95,7 @@
            if test "$EMACS_FLAVOR" = "xemacs"; then
 	       lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus"
            else
-               lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+               lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus"
            fi
 	   break
 	fi
@@ -113,7 +113,7 @@
     if test "$EMACS_FLAVOR" = "xemacs"; then
       etcdir="\$(lispdir)/../../etc"
     else
-    etcdir="\$(lispdir)/../etc"
+    etcdir="\$(lispdir)/../../etc"
     fi
   fi
   AC_MSG_RESULT($etcdir)
--- lisp/Makefile.in~	2004-05-20 09:43:25 +0000
+++ lisp/Makefile.in	2005-09-30 01:14:57 +0000
@@ -29,7 +29,7 @@
 clever some l: gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
-install: install-el install-elc 
+install: install-el-elc 
 
 install-el: gnus-load.el
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
@@ -51,6 +51,21 @@
 	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
 	done
 
+install-el-elc: clever
+	rm -f dgnushack.elc
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
+	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
+	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
+	for p in *.elc; do \
+	  q=`basename $$p c`; \
+	  if [ -f "$(srcdir)/$$q" ]; then \
+	    echo " $(INSTALL_DATA) $$q $(lispdir)/$$q"; \
+	    $(INSTALL_DATA) $(srcdir)/$$q $(lispdir)/$$q; \
+	  fi; \
+	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+	done
+
 uninstall:
 	for p in *.elc; do \
 	  rm -f "$(lispdir)/$$p"; \