diff options
| author | Richard M. Stallman | 1994-05-17 19:44:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-05-17 19:44:17 +0000 |
| commit | b46498ae45f3a3d665aafc7fe3f9a45dff47d508 (patch) | |
| tree | e10edddf3e98c6d766192602dd8ec21b965994e7 | |
| parent | d520f0d2ad1899d8c5145ec49b8dfb61645ce6c0 (diff) | |
| download | emacs-b46498ae45f3a3d665aafc7fe3f9a45dff47d508.tar.gz emacs-b46498ae45f3a3d665aafc7fe3f9a45dff47d508.zip | |
(ALL_LDFLAGS): Add LDFLAGS.
(MAKE): Don't override a previous value of MAKE set by configure.
| -rw-r--r-- | src/Makefile.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 8340f56ba60..59e4ec98ad4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -74,8 +74,6 @@ SHELL=/bin/sh | |||
| 74 | /* On some systems we may not be able to use the system make command. */ | 74 | /* On some systems we may not be able to use the system make command. */ |
| 75 | #ifdef MAKE_COMMAND | 75 | #ifdef MAKE_COMMAND |
| 76 | MAKE = MAKE_COMMAND | 76 | MAKE = MAKE_COMMAND |
| 77 | #else | ||
| 78 | MAKE=make | ||
| 79 | #endif | 77 | #endif |
| 80 | 78 | ||
| 81 | #ifdef C_COMPILER | 79 | #ifdef C_COMPILER |
| @@ -395,7 +393,7 @@ LD=ld | |||
| 395 | #endif /* not COFF_ENCAPSULATE */ | 393 | #endif /* not COFF_ENCAPSULATE */ |
| 396 | #endif /* not ORDINARY_LINK */ | 394 | #endif /* not ORDINARY_LINK */ |
| 397 | 395 | ||
| 398 | ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE | 396 | ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS) |
| 399 | 397 | ||
| 400 | /* A macro which other sections of ymakefile can redefine to munge the | 398 | /* A macro which other sections of ymakefile can redefine to munge the |
| 401 | flags before they're passed to LD. This is helpful if you have | 399 | flags before they're passed to LD. This is helpful if you have |