Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- info/Makefile.am	11 Apr 2004 17:56:45 -0000	1.4
+++ info/Makefile.am	8 Oct 2004 10:01:49 -0000
@@ -35,7 +35,7 @@
 # to those functions along with completable names and documentation strings.
 BUILT_SOURCES = doc.c funs.h key.c
 
-EXTRA_DIST = README pcterm.c $(BUILT_SOURCES)
+EXTRA_DIST = README pcterm.c
 
 makedoc_SOURCES = makedoc.c
 ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
@@ -45,15 +45,20 @@
   infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c nodes.h \
   search.c search.h session.c session.h signals.c signals.h \
   termdep.h terminal.c terminal.h tilde.c tilde.h \
-  variables.c variables.h window.c window.h \
-  $(BUILT_SOURCES) $(generated_sources)
-infokey_SOURCES = infokey.c infokey.h key.c key.h
+  variables.c variables.h window.c window.h
+nodist_ginfo_SOURCES = $(BUILT_SOURCES)
+
+infokey_SOURCES = infokey.c infokey.h key.h
+nodist_infokey_SOURCES = key.c
 
 # Files with Info commands defined that makedoc should read.
 cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
   $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
   $(srcdir)/footnotes.c $(srcdir)/variables.c
 
+distclean-local:
+	rm -f $(BUILT_SOURCES)
+
 # The $(EXEEXT) should be added by Automake, but isn't. Fine.
 $(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources)
 	rm -f $(BUILT_SOURCES)