Commit 8ac457d5 authored by Paul Eggert's avatar Paul Eggert

* Makefile.in (force-info): Remove.

All uses removed.  This hack is no longer needed here
now that we can assume GNU Make's .PHONY feature works.
(bootstrap): No need to make 'info', since 'all' now implies 'info'.
parent e51c8d91
2014-04-17 Paul Eggert <eggert@cs.ucla.edu> 2014-04-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (FRC): Remove. * Makefile.in (FRC, force-info): Remove.
All uses removed. This hack is no longer needed here All uses removed. This hack is no longer needed here
now that we can assume GNU Make's .PHONY feature works. now that we can assume GNU Make's .PHONY feature works.
(bootstrap): No need to make 'info', since 'all' now implies 'info'.
2014-04-16 Eli Zaretskii <eliz@gnu.org> 2014-04-16 Eli Zaretskii <eliz@gnu.org>
......
...@@ -951,7 +951,7 @@ $(DOCS): ...@@ -951,7 +951,7 @@ $(DOCS):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
.PHONY: $(DOCS) docs pdf ps .PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check html info-real info-dir force-info check-info .PHONY: info dvi dist check html info-real info-dir check-info
## TODO add etc/refcards. ## TODO add etc/refcards.
docs: $(DOCS) docs: $(DOCS)
...@@ -1032,7 +1032,6 @@ uninstall-pdf: $(UNINSTALL_PDF) ...@@ -1032,7 +1032,6 @@ uninstall-pdf: $(UNINSTALL_PDF)
uninstall-ps: $(UNINSTALL_PS) uninstall-ps: $(UNINSTALL_PS)
force-info:
# Note that man/Makefile knows how to put the info files in $(srcdir), # Note that man/Makefile knows how to put the info files in $(srcdir),
# so we can do ok running make in the build dir. # so we can do ok running make in the build dir.
# This used to have a clause that exited with an error if MAKEINFO = no. # This used to have a clause that exited with an error if MAKEINFO = no.
...@@ -1044,7 +1043,7 @@ force-info: ...@@ -1044,7 +1043,7 @@ force-info:
# would require changing every rule in doc/ that builds an info file, # would require changing every rule in doc/ that builds an info file,
# and it's not worth it. This case is only relevant if you download a # and it's not worth it. This case is only relevant if you download a
# release, then change the .texi files. # release, then change the .texi files.
info: force-info info:
@if test "$(HAVE_MAKEINFO)" = "no"; then \ @if test "$(HAVE_MAKEINFO)" = "no"; then \
echo "Configured --without-makeinfo, not building manuals" ; \ echo "Configured --without-makeinfo, not building manuals" ; \
else \ else \
...@@ -1089,7 +1088,7 @@ check-info: info ...@@ -1089,7 +1088,7 @@ check-info: info
bootstrap: bootstrap-clean bootstrap: bootstrap-clean
cd $(srcdir) && ./autogen.sh cd $(srcdir) && ./autogen.sh
$(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) $(MFLAGS) info all $(MAKE) $(MFLAGS) all
.PHONY: check-declare .PHONY: check-declare
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment