Avoid having a directory as a prerequisite in doc Makefiles.

It does not play well with time-stamping.

* doc/misc/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.  Use it in all the info rules, rather than depending
on infodir.

* doc/lispref/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/elisp): Use $mkinfodir instead of infodir.

* doc/lispintro/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/eintr): Use $mkinfodir instead of infodir.

* doc/emacs/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/emacs): Use $mkinfodir instead of infodir.

8 files changed, 133 insertions, 62 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 468a789c1d..478a3de1d4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <[email protected]>
 
+	* Makefile.in ($(infodir)): Delete rule.
+	(mkinfodir): New.
+	($(infodir)/emacs): Use $mkinfodir instead of infodir.
+
 	* Makefile.in (distclean): Do not delete emacsver.texi.
 	* emacsver.texi: New file, replacing emacsver.texi.in.
 
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index c50878ff53..dd3bad1b8b 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -117,13 +117,15 @@ EMACSSOURCES= \
 	${srcdir}/kmacro.texi \
 	$(EMACS_XTRA)
 
+## This seems pointless.  The info/ directory exists in both the
+## repository and the release tarfiles.  We do not use any
+## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## solution anyway.  The second test -d is for parallel builds.
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+
 .PHONY: info dvi pdf
 
 info: $(infodir)/emacs
-
-$(infodir):
-	mkdir $@ || test -d $@
-
 dvi: emacs.dvi
 pdf: emacs.pdf
 
@@ -131,7 +133,8 @@ pdf: emacs.pdf
 # There is no provision for Info files to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 
-$(infodir)/emacs: $(infodir) ${EMACSSOURCES}
+$(infodir)/emacs: ${EMACSSOURCES}
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) emacs.texi -o $@
 
 emacs.dvi: ${EMACSSOURCES}
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 95501d6ff7..72e743e4eb 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-09  Glenn Morris  <[email protected]>
 
+	* Makefile.in ($(infodir)): Delete rule.
+	(mkinfodir): New.
+	($(infodir)/eintr): Use $mkinfodir instead of infodir.
+
+2010-10-09  Glenn Morris  <[email protected]>
+
 	* Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.
 
 2010-10-07  Glenn Morris  <[email protected]>
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 41f8f2a5c7..40cb48110c 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -34,22 +34,22 @@ TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+
 .SUFFIXES: .dvi .ps .texi
 
 .PHONY: info dvi html pdf
 
 info: ${infodir}/eintr
 
-$(infodir):
-	mkdir $@ || test -d $@
-
 dvi: emacs-lisp-intro.dvi
 html: emacs-lisp-intro.html
 pdf: emacs-lisp-intro.pdf
 
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
-${infodir}/eintr: $(infodir) ${srcdir}/emacs-lisp-intro.texi
+${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $@
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8a3242a685..262c3bc482 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-09  Glenn Morris  <[email protected]>
 
+	* Makefile.in ($(infodir)): Delete rule.
+	(mkinfodir): New.
+	($(infodir)/elisp): Use $mkinfodir instead of infodir.
+
+2010-10-09  Glenn Morris  <[email protected]>
+
 	* Makefile.in (emacsdir): New variable.
 	(MAKEINFO): Add -I $emacsdir.
 	(dist): Copy emacsver.texi.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 4336a25d5e..e5786bfd5f 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -96,6 +96,8 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+
 .PHONY: info dvi pdf
 
 # The info file is named `elisp'.
@@ -103,10 +105,8 @@ info: $(infodir)/elisp
 dvi: elisp.dvi
 pdf: elisp.pdf
 
-$(infodir):
-	mkdir $@ || test -d $@
-
-$(infodir)/elisp: $(infodir) $(srcs)
+$(infodir)/elisp: $(srcs)
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@
 
 elisp.dvi: $(srcs)
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3d83437181..e080d1fe26 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-09  Glenn Morris  <[email protected]>
 
+	* Makefile.in ($(infodir)): Delete rule.
+	(mkinfodir): New.  Use it in all the info rules, rather than depending
+	on infodir.
+
+2010-10-09  Glenn Morris  <[email protected]>
+
 	* gnus.texi (Article Washing): Fix previous change.
 
 	* Makefile.in (emacsdir): New variable.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 153aaa40d5..fdb539db9f 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -201,14 +201,12 @@ TEXI2PDF = texi2pdf
 
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
+mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 .PHONY: info dvi pdf
 
 info: $(INFO_TARGETS)
 
-$(infodir):
-	mkdir $@ || test -d $@
-
 dvi: $(DVI_TARGETS)
 
 pdf: $(PDF_TARGETS)
@@ -220,7 +218,8 @@ pdf: $(PDF_TARGETS)
 
 ## "short" target names for convenience, to just rebuild one manual.
 ada-mode : $(infodir)/ada-mode
-$(infodir)/ada-mode: ada-mode.texi $(infodir)
+$(infodir)/ada-mode: ada-mode.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) ada-mode.texi
 ada-mode.dvi: ada-mode.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
@@ -228,7 +227,8 @@ ada-mode.pdf: ada-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
 
 auth : $(infodir)/auth
-$(infodir)/auth: auth.texi $(infodir)
+$(infodir)/auth: auth.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) auth.texi
 auth.dvi: auth.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
@@ -236,7 +236,8 @@ auth.pdf: auth.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
 
 autotype : $(infodir)/autotype
-$(infodir)/autotype: autotype.texi $(infodir)
+$(infodir)/autotype: autotype.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) autotype.texi
 autotype.dvi: autotype.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
@@ -244,7 +245,8 @@ autotype.pdf: autotype.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
 
 calc : $(infodir)/calc
-$(infodir)/calc: calc.texi $(infodir)
+$(infodir)/calc: calc.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) calc.texi
 calc.dvi: calc.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
@@ -252,7 +254,8 @@ calc.pdf: calc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
 
 ccmode : $(infodir)/ccmode
-$(infodir)/ccmode: cc-mode.texi $(infodir)
+$(infodir)/ccmode: cc-mode.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) cc-mode.texi
 cc-mode.dvi: cc-mode.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
@@ -260,7 +263,8 @@ cc-mode.pdf: cc-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
 
 cl : $(infodir)/cl
-$(infodir)/cl: cl.texi $(infodir)
+$(infodir)/cl: cl.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) cl.texi
 cl.dvi: cl.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
@@ -268,7 +272,8 @@ cl.pdf: cl.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
 
 dbus : $(infodir)/dbus
-$(infodir)/dbus: dbus.texi $(infodir)
+$(infodir)/dbus: dbus.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) dbus.texi
 dbus.dvi: dbus.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
@@ -276,7 +281,8 @@ dbus.pdf: dbus.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
 
 dired-x : $(infodir)/dired-x
-$(infodir)/dired-x: dired-x.texi $(infodir)
+$(infodir)/dired-x: dired-x.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) dired-x.texi
 dired-x.dvi: dired-x.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
@@ -284,7 +290,8 @@ dired-x.pdf: dired-x.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
 
 ebrowse : $(infodir)/ebrowse
-$(infodir)/ebrowse: ebrowse.texi $(infodir)
+$(infodir)/ebrowse: ebrowse.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) ebrowse.texi
 ebrowse.dvi: ebrowse.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
@@ -292,7 +299,8 @@ ebrowse.pdf: ebrowse.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
 
 ede : $(infodir)/ede
-$(infodir)/ede: ede.texi $(infodir)
+$(infodir)/ede: ede.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) ede.texi
 ede.dvi: ede.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
@@ -300,7 +308,8 @@ ede.pdf: ede.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
 
 ediff : $(infodir)/ediff
-$(infodir)/ediff: ediff.texi $(infodir)
+$(infodir)/ediff: ediff.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) ediff.texi
 ediff.dvi: ediff.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
@@ -308,7 +317,8 @@ ediff.pdf: ediff.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
 
 edt : $(infodir)/edt
-$(infodir)/edt: edt.texi $(infodir)
+$(infodir)/edt: edt.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) edt.texi
 edt.dvi: edt.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
@@ -316,7 +326,8 @@ edt.pdf: edt.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
 
 eieio : $(infodir)/eieio
-$(infodir)/eieio: eieio.texi $(infodir)
+$(infodir)/eieio: eieio.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) eieio.texi
 eieio.dvi: eieio.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
@@ -324,7 +335,8 @@ eieio.pdf: eieio.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
 
 emacs-mime : $(infodir)/emacs-mime
-$(infodir)/emacs-mime: emacs-mime.texi $(infodir)
+$(infodir)/emacs-mime: emacs-mime.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
 emacs-mime.dvi: emacs-mime.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
@@ -332,7 +344,8 @@ emacs-mime.pdf: emacs-mime.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
 
 epa : $(infodir)/epa
-$(infodir)/epa: epa.texi $(infodir)
+$(infodir)/epa: epa.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) epa.texi
 epa.dvi: epa.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
@@ -340,7 +353,8 @@ epa.pdf: epa.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
 
 erc : $(infodir)/erc
-$(infodir)/erc: erc.texi $(infodir)
+$(infodir)/erc: erc.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) erc.texi
 erc.dvi: erc.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
@@ -348,7 +362,8 @@ erc.pdf: erc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
 
 eshell : $(infodir)/eshell
-$(infodir)/eshell: eshell.texi $(infodir)
+$(infodir)/eshell: eshell.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) eshell.texi
 eshell.dvi: eshell.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
@@ -357,6 +372,7 @@ eshell.pdf: eshell.texi
 
 eudc : $(infodir)/eudc
 $(infodir)/eudc: eudc.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) eudc.texi
 eudc.dvi: eudc.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
@@ -364,7 +380,8 @@ eudc.pdf: eudc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
 
 efaq : $(infodir)/efaq
-$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi $(infodir)
+$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) -I $(emacsdir) faq.texi
 faq.dvi: faq.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
@@ -373,6 +390,7 @@ faq.pdf: faq.texi
 
 flymake : $(infodir)/flymake
 $(infodir)/flymake: flymake.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) flymake.texi
 flymake.dvi: flymake.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
@@ -380,7 +398,8 @@ flymake.pdf: flymake.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
 
 forms : $(infodir)/forms
-$(infodir)/forms: forms.texi $(infodir)
+$(infodir)/forms: forms.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) forms.texi
 forms.dvi: forms.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
@@ -389,7 +408,8 @@ forms.pdf: forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
 gnus : $(infodir)/gnus
-$(infodir)/gnus: gnus.texi gnus-faq.texi $(infodir)
+$(infodir)/gnus: gnus.texi gnus-faq.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) gnus.texi
 gnus.dvi: gnus.texi gnus-faq.texi
 	sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
@@ -405,7 +425,8 @@ gnus.pdf: gnus.texi gnus-faq.texi
 # This is produced with --no-split to avoid making files whose
 # names clash on DOS 8+3 filesystems
 idlwave : $(infodir)/idlwave
-$(infodir)/idlwave: idlwave.texi $(infodir)
+$(infodir)/idlwave: idlwave.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
 idlwave.dvi: idlwave.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
@@ -416,7 +437,8 @@ idlwave.pdf: idlwave.texi
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
 ###info : $(infodir)/info   # circular!
-$(infodir)/info: info.texi $(infodir)
+$(infodir)/info: info.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
 info.dvi: info.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
@@ -424,7 +446,8 @@ info.pdf: info.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
 
 mairix-el : $(infodir)/mairix-el
-$(infodir)/mairix-el: mairix-el.texi $(infodir)
+$(infodir)/mairix-el: mairix-el.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) mairix-el.texi
 mairix-el.dvi: mairix-el.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
@@ -432,7 +455,8 @@ mairix-el.pdf: mairix-el.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
 
 message : $(infodir)/message
-$(infodir)/message: message.texi $(infodir)
+$(infodir)/message: message.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) message.texi
 message.dvi: message.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
@@ -440,7 +464,8 @@ message.pdf: message.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
 
 mh-e : $(infodir)/mh-e
-$(infodir)/mh-e: mh-e.texi $(infodir)
+$(infodir)/mh-e: mh-e.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) mh-e.texi
 mh-e.dvi: mh-e.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
@@ -448,7 +473,8 @@ mh-e.pdf: mh-e.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
 
 newsticker : $(infodir)/newsticker
-$(infodir)/newsticker: newsticker.texi $(infodir)
+$(infodir)/newsticker: newsticker.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) newsticker.texi
 newsticker.dvi: newsticker.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
@@ -456,7 +482,8 @@ newsticker.pdf: newsticker.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
 
 nxml-mode : $(infodir)/nxml-mode
-$(infodir)/nxml-mode: nxml-mode.texi $(infodir)
+$(infodir)/nxml-mode: nxml-mode.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) nxml-mode.texi
 nxml-mode.dvi: nxml-mode.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
@@ -464,7 +491,8 @@ nxml-mode.pdf: nxml-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
 
 org : $(infodir)/org
-$(infodir)/org: org.texi $(infodir)
+$(infodir)/org: org.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) org.texi
 org.dvi: org.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
@@ -472,7 +500,8 @@ org.pdf: org.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
 
 pcl-cvs : $(infodir)/pcl-cvs
-$(infodir)/pcl-cvs: pcl-cvs.texi $(infodir)
+$(infodir)/pcl-cvs: pcl-cvs.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
 pcl-cvs.dvi: pcl-cvs.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
@@ -480,7 +509,8 @@ pcl-cvs.pdf: pcl-cvs.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
 
 pgg : $(infodir)/pgg
-$(infodir)/pgg: pgg.texi $(infodir)
+$(infodir)/pgg: pgg.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) pgg.texi
 pgg.dvi: pgg.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
@@ -488,7 +518,8 @@ pgg.pdf: pgg.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
 
 rcirc : $(infodir)/rcirc
-$(infodir)/rcirc: rcirc.texi $(infodir)
+$(infodir)/rcirc: rcirc.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) rcirc.texi
 rcirc.dvi: rcirc.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
@@ -496,7 +527,8 @@ rcirc.pdf: rcirc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
 
 reftex : $(infodir)/reftex
-$(infodir)/reftex: reftex.texi $(infodir)
+$(infodir)/reftex: reftex.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) reftex.texi
 reftex.dvi: reftex.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
@@ -504,7 +536,8 @@ reftex.pdf: reftex.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
 
 remember : $(infodir)/remember
-$(infodir)/remember: remember.texi $(infodir)
+$(infodir)/remember: remember.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) remember.texi
 remember.dvi: remember.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
@@ -512,7 +545,8 @@ remember.pdf: remember.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
 
 sasl : $(infodir)/sasl
-$(infodir)/sasl: sasl.texi $(infodir)
+$(infodir)/sasl: sasl.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) sasl.texi
 sasl.dvi: sasl.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
@@ -520,7 +554,8 @@ sasl.pdf: sasl.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
 
 sc : $(infodir)/sc
-$(infodir)/sc: sc.texi $(infodir)
+$(infodir)/sc: sc.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) sc.texi
 sc.dvi: sc.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
@@ -528,7 +563,8 @@ sc.pdf: sc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
 
 semantic : $(infodir)/semantic
-$(infodir)/semantic: semantic.texi sem-user.texi $(infodir)
+$(infodir)/semantic: semantic.texi sem-user.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) semantic.texi
 semantic.dvi: semantic.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
@@ -536,7 +572,8 @@ semantic.pdf: semantic.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
 
 ses : $(infodir)/ses
-$(infodir)/ses: ses.texi $(infodir)
+$(infodir)/ses: ses.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) ses.texi
 ses.dvi: ses.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
@@ -544,7 +581,8 @@ ses.pdf: ses.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
 
 sieve : $(infodir)/sieve
-$(infodir)/sieve: sieve.texi $(infodir)
+$(infodir)/sieve: sieve.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) sieve.texi
 sieve.dvi: sieve.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
@@ -552,7 +590,8 @@ sieve.pdf: sieve.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
 
 smtpmail : $(infodir)/smtpmail
-$(infodir)/smtpmail: smtpmail.texi $(infodir)
+$(infodir)/smtpmail: smtpmail.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) smtpmail.texi
 smtpmail.dvi: smtpmail.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
@@ -560,7 +599,8 @@ smtpmail.pdf: smtpmail.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
 
 speedbar : $(infodir)/speedbar
-$(infodir)/speedbar: speedbar.texi $(infodir)
+$(infodir)/speedbar: speedbar.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) speedbar.texi
 speedbar.dvi: speedbar.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
@@ -568,7 +608,8 @@ speedbar.pdf: speedbar.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
 
 tramp : $(infodir)/tramp
-$(infodir)/tramp: tramp.texi trampver.texi $(infodir)
+$(infodir)/tramp: tramp.texi trampver.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
 tramp.dvi: tramp.texi trampver.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
@@ -576,7 +617,8 @@ tramp.pdf: tramp.texi trampver.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
 
 url : $(infodir)/url
-$(infodir)/url: url.texi $(infodir)
+$(infodir)/url: url.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) url.texi
 url.dvi: url.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
@@ -584,7 +626,8 @@ url.pdf: url.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
 
 vip : $(infodir)/vip
-$(infodir)/vip: vip.texi $(infodir)
+$(infodir)/vip: vip.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) vip.texi
 vip.dvi: vip.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
@@ -592,7 +635,8 @@ vip.pdf: vip.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
 
 viper : $(infodir)/viper
-$(infodir)/viper: viper.texi $(infodir)
+$(infodir)/viper: viper.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) viper.texi
 viper.dvi: viper.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
@@ -600,7 +644,8 @@ viper.pdf: viper.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
 
 widget : $(infodir)/widget
-$(infodir)/widget: widget.texi $(infodir)
+$(infodir)/widget: widget.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) widget.texi
 widget.dvi: widget.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
@@ -608,7 +653,8 @@ widget.pdf: widget.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
 
 woman : $(infodir)/woman
-$(infodir)/woman: woman.texi $(infodir)
+$(infodir)/woman: woman.texi
+	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) woman.texi
 woman.dvi: woman.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi