diff options
| author | Paul Eggert | 2017-01-07 18:15:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-07 18:15:37 -0800 |
| commit | 952d0f2ce4c262f45d19acffb107c7167cd5e07f (patch) | |
| tree | bd4474ac2cc62275c39529d9ad4e7097f19f3813 | |
| parent | 77f35363fd9bb743716a196a3168fa94d896c28e (diff) | |
| download | emacs-952d0f2ce4c262f45d19acffb107c7167cd5e07f.tar.gz emacs-952d0f2ce4c262f45d19acffb107c7167cd5e07f.zip | |
Remove @SET_MAKE@ from manually-maintained files
Emacs now assumes GNU Make, so @SET_MAKE@ is no longer needed.
* Makefile.in, lwlib/Makefile.in, nextstep/Makefile.in:
* src/Makefile.in: Remove @SET_MAKE@.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 1 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 1 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
4 files changed, 0 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 0ecb273fb2a..2e205d88c42 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -68,9 +68,6 @@ SHELL = @SHELL@ | |||
| 68 | # current directory. | 68 | # current directory. |
| 69 | CDPATH= | 69 | CDPATH= |
| 70 | 70 | ||
| 71 | # If Make doesn't predefine MAKE, set it here. | ||
| 72 | @SET_MAKE@ | ||
| 73 | |||
| 74 | # ==================== Things 'configure' Might Edit ==================== | 71 | # ==================== Things 'configure' Might Edit ==================== |
| 75 | 72 | ||
| 76 | cache_file = @cache_file@ | 73 | cache_file = @cache_file@ |
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index efb7f3a7ab6..d6a8f50ce74 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in | |||
| @@ -26,7 +26,6 @@ srcdir=@srcdir@ | |||
| 26 | # MinGW CPPFLAGS may use this. | 26 | # MinGW CPPFLAGS may use this. |
| 27 | abs_top_srcdir=@abs_top_srcdir@ | 27 | abs_top_srcdir=@abs_top_srcdir@ |
| 28 | VPATH=@srcdir@ | 28 | VPATH=@srcdir@ |
| 29 | @SET_MAKE@ | ||
| 30 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ | 29 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ |
| 31 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 30 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
| 32 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | 31 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ |
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 2d8f85b74a0..ad1abb0bf50 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in | |||
| @@ -30,7 +30,6 @@ EXEEXT = @EXEEXT@ | |||
| 30 | # abs_top_srcdir may contain ".." | 30 | # abs_top_srcdir may contain ".." |
| 31 | top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P) | 31 | top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P) |
| 32 | 32 | ||
| 33 | @SET_MAKE@ | ||
| 34 | MKDIR_P = @MKDIR_P@ | 33 | MKDIR_P = @MKDIR_P@ |
| 35 | 34 | ||
| 36 | ## Emacs.app. | 35 | ## Emacs.app. |
diff --git a/src/Makefile.in b/src/Makefile.in index dbe6b6aa000..ab319837249 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -38,9 +38,6 @@ CPPFLAGS = @CPPFLAGS@ | |||
| 38 | LDFLAGS = @LDFLAGS@ | 38 | LDFLAGS = @LDFLAGS@ |
| 39 | EXEEXT = @EXEEXT@ | 39 | EXEEXT = @EXEEXT@ |
| 40 | version = @version@ | 40 | version = @version@ |
| 41 | # Substitute an assignment for the MAKE variable, because | ||
| 42 | # BSD doesn't have it as a default. | ||
| 43 | @SET_MAKE@ | ||
| 44 | MKDIR_P = @MKDIR_P@ | 41 | MKDIR_P = @MKDIR_P@ |
| 45 | # Don't use LIBS. configure puts stuff in it that either shouldn't be | 42 | # Don't use LIBS. configure puts stuff in it that either shouldn't be |
| 46 | # linked with Emacs or is duplicated by the other stuff below. | 43 | # linked with Emacs or is duplicated by the other stuff below. |