Commit 534e4e80 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 27087453
2011-02-19 Eli Zaretskii <eliz@gnu.org> 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 * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
rules. rules.
(HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
......
...@@ -83,12 +83,12 @@ all: lib lib-src src emacs misc lispref lispintro ...@@ -83,12 +83,12 @@ all: lib lib-src src emacs misc lispref lispintro
lib: FRC lib: FRC
cd lib cd lib
$(MAKE) top_srcdir=${top_srcdir} version=${version} $(MAKE) top_srcdir=${top_srcdir} all
cd .. cd ..
lib-src: lib FRC lib-src: lib FRC
cd lib-src cd lib-src
$(MAKE) top_srcdir=${top_srcdir} version=${version} $(MAKE) top_srcdir=${top_srcdir} all
cd .. cd ..
# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which # Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
...@@ -102,7 +102,7 @@ lib-src: lib FRC ...@@ -102,7 +102,7 @@ lib-src: lib FRC
# is not wrong, but is overkill in 99.99% of the cases. # is not wrong, but is overkill in 99.99% of the cases.
src: lib lib-src FRC src: lib lib-src FRC
cd src 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),' \ djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
'/environment *TERM/s/^.*/set environment TERM internal/' \ '/environment *TERM/s/^.*/set environment TERM internal/' \
>gdb.sed >gdb.sed
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/^# DIST: /d /^# DIST: /d
/^SHELL *=/s/^/# / /^SHELL *=/s/^/# /
/^CC *=/s/=.*$/=gcc/ /^CC *=/s/=.*$/=gcc/
/-DVERSION=/s/@version@/\${version}/ s/-DVERSION[^ ]* //
/^configname *=/s/=.*$/=msdos/ /^configname *=/s/=.*$/=msdos/
/^archlibdir *=/s!=.*$!=/emacs/bin! /^archlibdir *=/s!=.*$!=/emacs/bin!
/^bindir *=/s!=.*$!=/emacs/bin! /^bindir *=/s!=.*$!=/emacs/bin!
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
/^LOADLIBES *=/s!=.*$!=!
/^ALLOCA *=/s!@ALLOCA@!! /^ALLOCA *=/s!@ALLOCA@!!
/^EXEEXT *=/s!@EXEEXT@!! /^EXEEXT *=/s!@EXEEXT@!!
/^GETOPT_H *=/s!@GETOPT_H@!getopt.h! /^GETOPT_H *=/s!@GETOPT_H@!getopt.h!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment