From f272c0fda934b51fcb62bf90b232b52f7218b863 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 6 Feb 2008 23:01:28 +0000 Subject: [PATCH] Revert last change --- doc/emacs/ChangeLog | 5 ----- doc/emacs/makefile.w32-in | 4 ++-- doc/lispref/ChangeLog | 5 ----- doc/lispref/makefile.w32-in | 4 ++-- doc/misc/ChangeLog | 5 ----- doc/misc/makefile.w32-in | 8 ++++---- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index ad83776b711..5f416f61612 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,8 +1,3 @@ -2008-02-05 Jason Rumney - - * makefile.w32-in (info): Depend on $(infodir)/dir - ($(infodir)/dir): Depend on info files. - 2008-02-02 Eli Zaretskii * maintaining.texi (Tags): Fix last change. diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in index ad594887df6..99b9e173f65 100644 --- a/doc/emacs/makefile.w32-in +++ b/doc/emacs/makefile.w32-in @@ -102,7 +102,7 @@ EMACSSOURCES= \ $(srcdir)/kmacro.texi \ $(EMACS_XTRA) -info: $(INFO_TARGETS) $(infodir)/dir +info: $(INFO_TARGETS) dvi: $(DVI_TARGETS) @@ -111,7 +111,7 @@ dvi: $(DVI_TARGETS) # to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. -$(infodir)/dir: $(INFO_TARGETS) +$(infodir)/dir: $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) $(infodir)/emacs: $(EMACSSOURCES) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8703a279ec1..12539758018 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,8 +1,3 @@ -2008-02-05 Jason Rumney - - * makefile.w32-in (info): Depend on $(infodir)/dir - ($(infodir)/dir): Depend on info files. - 2008-01-27 Thien-Thi Nguyen * display.texi (Button Types): diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in index 7e7fe87be11..381d389cae3 100644 --- a/doc/lispref/makefile.w32-in +++ b/doc/lispref/makefile.w32-in @@ -101,9 +101,9 @@ srcs = \ # The info file is named `elisp'. -info: $(infodir)/elisp $(infodir)/dir +info: $(infodir)/elisp -$(infodir)/dir: $(infodir)/elisp +$(infodir)/dir: $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp $(infodir)/elisp: $(srcs) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 977def73eed..92be8efdee7 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -7,11 +7,6 @@ * tramp.texi (Remote processes): Add `shell-command'. -2008-02-05 Jason Rumney - - * makefile.w32-in (info): Depend on $(infodir)/dir - ($(infodir)/dir): Depend on info files. - 2008-01-28 Michael Sperber * gnus.texi (Mail Source Specifiers): Document `group' specifier. diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index 4da32e9e473..b0a8f0f1e64 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -64,7 +64,7 @@ ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \ "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C -info: $(INFO_TARGETS) $(infodir)/dir +info: $(INFO_TARGETS) dvi: $(DVI_TARGETS) @@ -73,15 +73,15 @@ dvi: $(DVI_TARGETS) # to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. +$(infodir)/dir: + $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) + # The following target uses an explicit -o switch to work around # the @setfilename directive in info.texi, which is required for # the Texinfo distribution. # Some Windows ports of makeinfo seem to require -o to come before the # texi filename, contrary to GNU standards. -$(infodir)/dir: $(INFO_TARGETS) - $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) - $(infodir)/info: $(INFOSOURCES) $(MAKEINFO) --no-split -o $@ info.texi -- 2.39.5