From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Sat, 8 May 2004 14:42:41 +0000 (+0000)
Subject: (emacsclient${EXEEXT}): Use makefile var `version'.
X-Git-Tag: ttn-vms-21-2-B4~6356
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2bcfb19fbc92c81876abb290f764758c59feca9;p=emacs.git

(emacsclient${EXEEXT}): Use makefile var `version'.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 75d5f964201..28a1fb8fcc0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-08  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* Makefile.in (emacsclient${EXEEXT}): Use makefile var `version'.
+
 2004-05-07  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* b2m.c (GOOD, BAD): Delete macros.  Throughout,
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7868364148a..1da04d88b82 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003
+# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004
 #  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -447,7 +447,7 @@ yow${EXEEXT}: ${srcdir}/yow.c ../src/epaths.h
 
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
 	$(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS)  \
-	   -DVERSION=`sed -n -e '/(defconst emacs-version/ s/^[^"]*\("[^"]*"\).*/\1/p' ${srcdir}/../lisp/version.el` \
+	   -DVERSION="\"${version}\"" \
 	   $(LOADLIBES) -o emacsclient
 
 hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h