From: Ken Raeburn <raeburn@raeburn.org>
Date: Mon, 10 Apr 2000 19:11:45 +0000 (+0000)
Subject: * Makefile.in (temacs): Revert 2000-03-12 change.
X-Git-Tag: emacs-pretest-21.0.90~4287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ed565689ed8614295e7f5f30fef933d1ab5ee1f;p=emacs.git

* Makefile.in (temacs): Revert 2000-03-12 change.
---

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}