summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-04-16 23:02:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-04-16 23:02:38 -0700
commit8ac457d5edccc6cb72be90f1d8efc7389d1c824c (patch)
treeb1c15bd5c25aff9f7e44d178e335fd24a9f858b8
parente51c8d91c2099e993b119447be4f7a859c5bb35e (diff)
* 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'.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in7
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a419cba153..c145829152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
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
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>
diff --git a/Makefile.in b/Makefile.in
index 201d7b8bb5..2eda8c365d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -951,7 +951,7 @@ $(DOCS):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
.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.
docs: $(DOCS)
@@ -1032,7 +1032,6 @@ uninstall-pdf: $(UNINSTALL_PDF)
uninstall-ps: $(UNINSTALL_PS)
-force-info:
# Note that man/Makefile knows how to put the info files in $(srcdir),
# 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.
@@ -1044,7 +1043,7 @@ force-info:
# 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
# release, then change the .texi files.
-info: force-info
+info:
@if test "$(HAVE_MAKEINFO)" = "no"; then \
echo "Configured --without-makeinfo, not building manuals" ; \
else \
@@ -1089,7 +1088,7 @@ check-info: info
bootstrap: bootstrap-clean
cd $(srcdir) && ./autogen.sh
$(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
- $(MAKE) $(MFLAGS) info all
+ $(MAKE) $(MFLAGS) all
.PHONY: check-declare