aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-17 00:33:53 +0200
committerLars Ingebrigtsen2019-06-17 00:33:59 +0200
commitfd9cff02796d7034783169015c592ed294ef106f (patch)
tree0676a067a2b098977b6ee11f017b5a2be64958df /src
parentb33cdf726c2fe81ac43b89af795b52224f8c38ae (diff)
downloademacs-fd9cff02796d7034783169015c592ed294ef106f.tar.gz
emacs-fd9cff02796d7034783169015c592ed294ef106f.zip
Fix up the --no-print-directory changes in src/Makefile.in
* src/Makefile.in (AM_V_NO_PD): New macro written by Andreas Schwab that can be either --no-print-directory or "". (%.elc): Use it instead if the if statement.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index b425643c04b..0e3efb359b8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -360,6 +360,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
360am__v_at_0 = @ 360am__v_at_0 = @
361am__v_at_1 = 361am__v_at_1 =
362 362
363AM_V_NO_PD = $(am__v_NO_PD_@AM_V@)
364am__v_NO_PD_ = $(am__v_NO_PD_@AM_DEFAULT_V@)
365am__v_NO_PD_0 = --no-print-directory
366am__v_NO_PD_1 =
367
363bootstrap_exe = ../src/bootstrap-emacs$(EXEEXT) 368bootstrap_exe = ../src/bootstrap-emacs$(EXEEXT)
364ifeq ($(DUMPING),pdumper) 369ifeq ($(DUMPING),pdumper)
365bootstrap_pdmp := bootstrap-emacs.pdmp # Keep in sync with loadup.el 370bootstrap_pdmp := bootstrap-emacs.pdmp # Keep in sync with loadup.el
@@ -776,12 +781,8 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
776## bootstrap-emacs$(EXEEXT) as an order-only prerequisite. 781## bootstrap-emacs$(EXEEXT) as an order-only prerequisite.
777 782
778%.elc: %.el | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp) 783%.elc: %.el | bootstrap-emacs$(EXEEXT) $(bootstrap_pdmp)
779ifeq (@AM_V@,1) 784 @$(MAKE) $(AM_V_NO_PD) -C ../lisp EMACS="$(bootstrap_exe)"\
780 @$(MAKE) -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $<c 785 THEFILE=$< $<c
781else
782 @$(MAKE) --no-print-directory\
783 -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $<c
784endif
785 786
786## VCSWITNESS points to the file that holds info about the current checkout. 787## VCSWITNESS points to the file that holds info about the current checkout.
787## We use it as a heuristic to decide when to rebuild loaddefs.el. 788## We use it as a heuristic to decide when to rebuild loaddefs.el.