diff options
| author | Paul Eggert | 2014-04-16 23:02:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-04-16 23:02:38 -0700 |
| commit | 8ac457d5edccc6cb72be90f1d8efc7389d1c824c (patch) | |
| tree | b1c15bd5c25aff9f7e44d178e335fd24a9f858b8 | |
| parent | e51c8d91c2099e993b119447be4f7a859c5bb35e (diff) | |
| download | emacs-8ac457d5edccc6cb72be90f1d8efc7389d1c824c.tar.gz emacs-8ac457d5edccc6cb72be90f1d8efc7389d1c824c.zip | |
* 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-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 7 |
2 files changed, 5 insertions, 5 deletions
| @@ -1,8 +1,9 @@ | |||
| 1 | 2014-04-17 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2014-04-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * Makefile.in (FRC): Remove. | 3 | * Makefile.in (FRC, force-info): Remove. |
| 4 | All uses removed. This hack is no longer needed here | 4 | All uses removed. This hack is no longer needed here |
| 5 | now that we can assume GNU Make's .PHONY feature works. | 5 | now that we can assume GNU Make's .PHONY feature works. |
| 6 | (bootstrap): No need to make 'info', since 'all' now implies 'info'. | ||
| 6 | 7 | ||
| 7 | 2014-04-16 Eli Zaretskii <eliz@gnu.org> | 8 | 2014-04-16 Eli Zaretskii <eliz@gnu.org> |
| 8 | 9 | ||
diff --git a/Makefile.in b/Makefile.in index 201d7b8bb56..2eda8c365da 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -951,7 +951,7 @@ $(DOCS): | |||
| 951 | t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 | 951 | t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 |
| 952 | 952 | ||
| 953 | .PHONY: $(DOCS) docs pdf ps | 953 | .PHONY: $(DOCS) docs pdf ps |
| 954 | .PHONY: info dvi dist check html info-real info-dir force-info check-info | 954 | .PHONY: info dvi dist check html info-real info-dir check-info |
| 955 | 955 | ||
| 956 | ## TODO add etc/refcards. | 956 | ## TODO add etc/refcards. |
| 957 | docs: $(DOCS) | 957 | docs: $(DOCS) |
| @@ -1032,7 +1032,6 @@ uninstall-pdf: $(UNINSTALL_PDF) | |||
| 1032 | uninstall-ps: $(UNINSTALL_PS) | 1032 | uninstall-ps: $(UNINSTALL_PS) |
| 1033 | 1033 | ||
| 1034 | 1034 | ||
| 1035 | force-info: | ||
| 1036 | # Note that man/Makefile knows how to put the info files in $(srcdir), | 1035 | # Note that man/Makefile knows how to put the info files in $(srcdir), |
| 1037 | # so we can do ok running make in the build dir. | 1036 | # so we can do ok running make in the build dir. |
| 1038 | # This used to have a clause that exited with an error if MAKEINFO = no. | 1037 | # This used to have a clause that exited with an error if MAKEINFO = no. |
| @@ -1044,7 +1043,7 @@ force-info: | |||
| 1044 | # would require changing every rule in doc/ that builds an info file, | 1043 | # would require changing every rule in doc/ that builds an info file, |
| 1045 | # and it's not worth it. This case is only relevant if you download a | 1044 | # and it's not worth it. This case is only relevant if you download a |
| 1046 | # release, then change the .texi files. | 1045 | # release, then change the .texi files. |
| 1047 | info: force-info | 1046 | info: |
| 1048 | @if test "$(HAVE_MAKEINFO)" = "no"; then \ | 1047 | @if test "$(HAVE_MAKEINFO)" = "no"; then \ |
| 1049 | echo "Configured --without-makeinfo, not building manuals" ; \ | 1048 | echo "Configured --without-makeinfo, not building manuals" ; \ |
| 1050 | else \ | 1049 | else \ |
| @@ -1089,7 +1088,7 @@ check-info: info | |||
| 1089 | bootstrap: bootstrap-clean | 1088 | bootstrap: bootstrap-clean |
| 1090 | cd $(srcdir) && ./autogen.sh | 1089 | cd $(srcdir) && ./autogen.sh |
| 1091 | $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile | 1090 | $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile |
| 1092 | $(MAKE) $(MFLAGS) info all | 1091 | $(MAKE) $(MFLAGS) all |
| 1093 | 1092 | ||
| 1094 | .PHONY: check-declare | 1093 | .PHONY: check-declare |
| 1095 | 1094 | ||