diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 19:54:18 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 19:54:18 +0200 |
| commit | 9162376add8858d60f12eb953c0f9178d5e8f448 (patch) | |
| tree | a07fe4b83bcd5c2062157d2a5d1bbfd4dae8020d | |
| parent | a2152ea482d2e796bba3e1995cec01cb274c9f42 (diff) | |
| download | emacs-9162376add8858d60f12eb953c0f9178d5e8f448.tar.gz | |
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.
| -rw-r--r-- | msdos/ChangeLog | 6 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 6 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index c96b53bb563..01a57c70a54 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! |