diff options
| author | Ken Raeburn | 2000-03-13 01:04:12 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2000-03-13 01:04:12 +0000 |
| commit | 854a025cb79c443bea04003517271bac9ac590d8 (patch) | |
| tree | 316894264229c692c2a92dc5982552bbcb85a205 /src | |
| parent | eee54b0efafc06deb9c320343479074ca00b091c (diff) | |
| download | emacs-854a025cb79c443bea04003517271bac9ac590d8.tar.gz emacs-854a025cb79c443bea04003517271bac9ac590d8.zip | |
* Makefile.in (temacs): Evaluate ALL_LDFLAGS into a temporary variable before
the invocation of YMF_PASS_LDFLAGS, in case both of them try to use backquotes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5d4c1221a74..7e35baa308f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2000-03-12 Ken Raeburn <raeburn@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (temacs): Evaluate ALL_LDFLAGS into a temporary | ||
| 4 | variable before the invocation of YMF_PASS_LDFLAGS, in case both | ||
| 5 | of them try to use backquotes. | ||
| 6 | |||
| 1 | 2000-03-12 Dave Love <fx@gnu.org> | 7 | 2000-03-12 Dave Love <fx@gnu.org> |
| 2 | 8 | ||
| 3 | * unexelf.c: Restore changes of 1999-10-19. | 9 | * unexelf.c: Restore changes of 1999-10-19. |
diff --git a/src/Makefile.in b/src/Makefile.in index b8e3a9fd021..932eb3dd1a5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -874,7 +874,8 @@ ${libsrc}make-docfile: | |||
| 874 | #endif | 874 | #endif |
| 875 | 875 | ||
| 876 | temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args | 876 | temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args |
| 877 | $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ | 877 | all_ldflags="${ALL_LDFLAGS}" && \ |
| 878 | $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} $${all_ldflags}) \ | ||
| 878 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ | 879 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ |
| 879 | OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} | 880 | OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} |
| 880 | 881 | ||