From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Feb 2011 17:54:18 +0000 (+0200)
Subject: Fix msdos/sed3v2.inp.  lib-src/ now builds.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~802^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=534e4e80e65e84f3f30567ba1b5727c79158f211;p=emacs.git

Fix msdos/sed3v2.inp.  lib-src/ now builds.

 sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit target.
---

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e9362054a93..c6c60013975 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,11 @@
 2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 
+	* sed3v2.inp (-DVERSION): Edit out.
+	(LOADLIBES): Don't edit to empty.
+
+	* mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit
+	target.
+
 	* sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 	rules.
 	(HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 0e77a68940a..1aea06d2a4d 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -83,12 +83,12 @@ all:	lib lib-src src emacs misc lispref lispintro
 
 lib: FRC
 	cd lib
-	$(MAKE) top_srcdir=${top_srcdir} version=${version}
+	$(MAKE) top_srcdir=${top_srcdir} all
 	cd ..
 
 lib-src: lib FRC
 	cd lib-src
-	$(MAKE) top_srcdir=${top_srcdir} version=${version}
+	$(MAKE) top_srcdir=${top_srcdir} all
 	cd ..
 
 # Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
@@ -102,7 +102,7 @@ lib-src: lib FRC
 # is not wrong, but is overkill in 99.99% of the cases.
 src: lib lib-src FRC
 	cd src
-	$(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}"
+	$(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" all
 	djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
 	          '/environment *TERM/s/^.*/set environment TERM internal/' \
 	       >gdb.sed
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 3a9d14a35af..346f4e07e77 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -18,7 +18,7 @@
 /^# DIST: /d
 /^SHELL *=/s/^/# /
 /^CC *=/s/=.*$/=gcc/
-/-DVERSION=/s/@version@/\${version}/
+s/-DVERSION[^ ]* //
 /^configname *=/s/=.*$/=msdos/
 /^archlibdir *=/s!=.*$!=/emacs/bin!
 /^bindir *=/s!=.*$!=/emacs/bin!
@@ -40,7 +40,6 @@
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
 /^GETOPT_H *=/s!@GETOPT_H@!getopt.h!