finish cleanup on infodir, some refinements on rules

	* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement

doc/Makefile

@@ -29,14 +29,16 @@ install:	org
 	$(CP) org $(infodir)
 	$(INSTALL_INFO) --infodir=$(infodir) org
 
-clean cleanall:
+clean:
 	$(RM) org *.pdf *.html *_letter.tex \
 	      *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs \
 	      *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps
+cleanall:	clean
+	$(RMR) guide manual
 
 clean-install:
 	$(RM) $(infodir)/org*
-	@echo You should run $(INSTALL_INFO) again to correct dir entries.
+	$(INSTALL_INFO) --infodir=$(infodir) --remove org
 
 .SUFFIXES:	# we don't need default suffix rules
 .SUFFIXES:	.texi .tex .txt

lisp/Makefile

@@ -51,5 +51,4 @@ $(LISPC):	dependencies.mk
 .SUFFIXES:	.el .elc
 
 .el.elc:
-	$(info in subdir lisp)
 	$(ELC) $<