procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit target.
This commit is contained in:
Eli Zaretskii 2011-02-19 19:54:18 +02:00
parent 27087453c9
commit 534e4e80e6
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
msdos/ChangeLog
View file

@ -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

6
msdos/mainmake.v2
View file

@ -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

3
msdos/sed3v2.inp
View file

@ -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!