aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <[email protected]>2000-04-10 19:11:45 +0000
committerKen Raeburn <[email protected]>2000-04-10 19:11:45 +0000
commit6ed565689ed8614295e7f5f30fef933d1ab5ee1f (patch)
tree69cfd489000b81d2205be04cc176026d3b7c2611
parentdf3b0cc64ed41e83302903277422017e0a77de66 (diff)
* Makefile.in (temacs): Revert 2000-03-12 change.
-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 2cee945ccf..98ade2552a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-10 Ken Raeburn <[email protected]>
+
+ * Makefile.in (temacs): Revert 2000-03-12 change.
+
2000-04-10 Jason Rumney <[email protected]>
* xfaces.c (realize_face): Change FRAME_X_P to FRAME_WINDOW_P.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8eedd252ba..f591fb1f22 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}