summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2cee945ccf3..98ade2552ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-10 Ken Raeburn <raeburn@gnu.org>
+
+ * Makefile.in (temacs): Revert 2000-03-12 change.
+
2000-04-10 Jason Rumney <jasonr@gnu.org>
* xfaces.c (realize_face): Change FRAME_X_P to FRAME_WINDOW_P.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8eedd252bac..f591fb1f229 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -874,8 +874,7 @@ ${libsrc}make-docfile:
#endif
temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
- all_ldflags="${ALL_LDFLAGS}" && \
- $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} $${all_ldflags}) \
+ $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
-o temacs ${STARTFILES} ${obj} ${otherobj} \
OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}