diff options
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/sed1v2.inp | 119 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 7 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 13 | ||||
| -rw-r--r-- | msdos/sed6.inp | 28 | ||||
| -rw-r--r-- | msdos/sedadmin.inp | 14 | ||||
| -rw-r--r-- | msdos/sedleim.inp | 10 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 34 | ||||
| -rw-r--r-- | msdos/sedlisp.inp | 4 |
8 files changed, 112 insertions, 117 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 71646821a59..383105a3f30 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -15,32 +15,24 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- -s/^#.*// s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ -/^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ -/^abs_builddir *=/s|@abs_builddir@|../src| -/^VPATH *=/s/@[^@\n]*@/./ -/^CC *=/s/@[^@\n]*@/gcc/ -/^CPP *=/s/@[^@\n]*@/gcc -e/ +/^top_srcdir *=/s/@[^@\n]*@/../ +/^CC *=/s/@[^@\n]*@/gcc -std=gnu99/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^ALL_CFLAGS *=/s/ -I\.//g /^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos| /^LDFLAGS *=/s/@[^@\n]*@// -/^LD_FIRSTFLAG *=/s/@[^@\n]*@// -/^LIBS *=/s/@[^@\n]*@// -/^LIBES *=/,/^ *$/ { - s/@[^@\n]*@//g -} /^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +/^PNG_CFLAGS *=/s/@PNG_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// @@ -64,6 +56,7 @@ s/ *@LIBPNG@// s/ *@LIBGIF@// s/ *@LIBXPM@// /^XFT_LIBS *=/s/@XFT_LIBS@// +/^XCB_LIBS *=/s/@XCB_LIBS@// /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// /^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// @@ -78,7 +71,8 @@ s/ *@LIBXPM@// /^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@// /^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@// /^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@// -/^GFILENOTIFY_LIBS *=/s/@GFILENOTIFY_LIBS@// +/^NOTIFY_LIBS *=/s/@NOTIFY_LIBS@// +/^NOTIFY_CFLAGS *=/s/@NOTIFY_CFLAGS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ @@ -92,7 +86,7 @@ s/ *@LIBXPM@// /^XGSELOBJ *=/s/@XGSELOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// -/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@// +/^LIBS_GNUSTEP *=/s/=.*$/=/ /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// @@ -101,15 +95,23 @@ s/ *@LIBXPM@// /^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@// /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// +/^XWIDGETS_OBJ *=/s/@XWIDGETS_OBJ@// +/^WEBKIT_LIBS *=/s/@WEBKIT_LIBS@// +/^WEBKIT_CFLAGS *=/s/@WEBKIT_CFLAGS@// +/^CAIRO_LIBS *=/s/@CAIRO_LIBS@// +/^CAIRO_CFLAGS *=/s/@CAIRO_CFLAGS@// +/^XFIXES_LIBS *=/s/@XFIXES_LIBS@// +/^XFIXES_CFLAGS *=/s/@XFIXES_CFLAGS@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// -/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// +/^GNU_OBJC_CFLAGS*=/s/=.*$/=/ /^LIBRESOLV *=/s/@LIBRESOLV@// +/^LIBMODULES *=/s/@LIBMODULES@// +/^MODULES_OBJ *=/s/@MODULES_OBJ@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// -/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIB_EXECINFO *=/s/@[^@\n]*@//g @@ -145,65 +147,59 @@ s/ *@LIBXPM@// /^W32_LIBS *=/s/@W32_LIBS@// /^version *=/s/@[^@\n]*@// /^EMACSRES *=/s/@EMACSRES@// -/^EMACS_MANIFEST *=/s/@EMACS_MANIFEST@// /^W32_RES_LINK *=/s/@W32_RES_LINK@// /^CM_OBJ *=/s/@CM_OBJ@/cm.o/ /^@SET_MAKE@$/s/@SET_MAKE@// -/^TEMACS_POST_LINK *=/s/@TEMACS_POST_LINK@/stubedit temacs.exe minstack=1024k/ /^ADDSECTION *=/s/@ADDSECTION@// -/^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! -/^ [ ]*\$(libsrc)\/make-docfile.*>.*gl.tmp/s!make-docfile!make-docfile -o gl.tmp! -/^.\$(libsrc)\/make-doc/s!>.*$!! -/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src! -/^[ ]*$/d -/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/ +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ +/^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/ +/^PAXCTL_if_present *=/s/=.*$/=@Rem/ +/^lisp\.mk:/,/^$/c\ +lisp.mk: $(lispsource)/loadup.el\ + @rm -f $@\ + ${AM_V_GEN}printf 'shortlisp = \\n' > $@\ + ${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\ + ${AM_V_GEN}djecho "" >> $@ + +#" + +/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC! +/ > \$(etc)\/DOC *$/s/ >.*$// +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp! +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!! +/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\ + cd ../src +/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ *test "X\$(PAXCTL)" = X/d -/^ *test "\$(CANNOT_DUMP)" = "yes"/d -/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d -/^ *\$(SETFATTR) -n/d -/^ -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/ +/^ *\$(PAXCTL_if_present) -zex/d +/^ *ln /s/ln /cp / +/^ *\$(SETFATTR_if_present) -n/d /^ fi/d +/^ *\$(RUN_TEMACS) /i\ + stubedit temacs.exe minstack=1024k /^ *LC_ALL=C \$(RUN_TEMACS)/i\ stubedit temacs.exe minstack=1024k /^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ /-batch -l loadup/a\ stubify emacs\ - stubedit emacs.exe minstack=2048k -s/ || exit 1\; \\$// -s/ || true\; \\$// + stubedit emacs.exe minstack=3072k s/ @true *$/ @rem/ s/^ [^ ]*move-if-change / update / -/^ echo[ ][ ]*timestamp/s/echo /djecho / +/^ [^ ]*echo[ ][ ]*timestamp/s/echo /djecho / /^ .*djecho timestamp/a\ - @rm -f gl.tmp -/^ cd ..\/leim && \$(MAKE)/i\ - $(RUN_TEMACS) -batch -l loadup dump\ - stubify emacs\ - stubedit emacs.exe minstack=2048k\ - rm -f b-emacs$(EXEEXT)\ - cp emacs$(EXEEXT) b-emacs$(EXEEXT) -/^ cd ..\/leim && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C ../leim leim-list.el EMACS=$(bootstrap_exe) -/^ cd ..\/admin\/unidata && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" -/^ cd \$(lib) && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C $(lib) libgnu.a -/^RUN_TEMACS *=/s|`/bin/pwd`|.| + @rm -f globals.tmp /^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit /^ #/d -/^ cd.*make-docfile/s!$!; cd ../src! /^ @: /d /^ -\{0,1\} *ln /s/ln /cp / /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ -s/@lisp_frag@// -s/@deps_frag@// -s/@ns_frag@// s/@PRE_EDIT_LDFLAGS@// s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ @@ -211,21 +207,24 @@ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/ /rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/ s/echo.*buildobj.lst/dj&/ -/ --load loadup bootstrap/i\ - stubedit temacs.exe minstack=1024k / --load loadup bootstrap/a\ stubify emacs /^ mv -f emacs/a\ stubedit b-emacs.exe minstack=3072k\ djecho bootlisp > bootlisp /^ -\{0,1\}rm -f/s/\\#/#/ -/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| -/^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | -/^buildobj\.h:/,/^ mv /{ - /^ *for /,/^ *done /c\ +/^buildobj\.h:/,/^ *\$(AM_V_at)mv /{ + /^ *\$(AM_V_GEN)for /,/^ *done /c\ djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp } +# Remove or replace dependencies we cannot have +/^\.PRECIOUS: /s!\.\./config.status !! +/^\.\.\/config.status: /d +/^Makefile: /s!\.\./config.status !! +/^\$(top_srcdir)\/aclocal\.m4 /,/^doc\.o:/c\ +\ +doc.o: buildobj.h # Make the GCC command line fit one screen line /^[ ][ ]*\$(GNUSTEP_CFLAGS)/d /^[ ][ ]*\$(GCONF_CFLAGS)/d @@ -233,7 +232,13 @@ s/echo.*buildobj.lst/dj&/ s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // s/ \$(C_SWITCH_X_SITE)// s/ \$(DBUS_CFLAGS)// -s| -I\$(srcdir)/../lib|| +s/ \$(PNG_CFLAGS) // +s/ \$(XINERAMA_CFLAGS)// +s/ \$(XFIXES_CFLAGS)// +s/ \$(FREETYPE_CFLAGS)// +s/ \$(FONTCONFIG_CFLAGS)// +s| -I\$(srcdir)/\.\./lib|| +s| -I\$(top_srcdir)/lib|| # Add our local inttypes.h to prerequisites where needed /^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| /^ *test "X/d diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 6079aab2604..d1a6eaba5de 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -64,7 +64,7 @@ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ -/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ /^#undef VERSION/s/^.*$/#define VERSION "25.1.50"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ @@ -82,7 +82,6 @@ /^#undef HAVE_SIGNED_SIG_ATOMIC_T *$/s/^.*$/#define HAVE_SIGNED_SIG_ATOMIC_T 1/ /^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/ /^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define HAVE_UNSIGNED_LONG_LONG_INT 1/ -/^#undef HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/ /^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/ /^#undef IS_DIRECTORY_SEP *$/s,^.*$,#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\'), /^#undef IS_DEVICE_SEP *$/s/^.*$/#define IS_DEVICE_SEP(_c_) ((_c_) == ':')/ @@ -91,6 +90,7 @@ /^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/ /^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR '\;'/ /^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/ +/^# *undef _GNU_SOURCE *$/s/^.*$/#define _GNU_SOURCE 1/ /^#undef inline/s/^.*$/#define inline __inline__/ /^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/ /^#undef restrict/s/^.*$/#define restrict __restrict/ @@ -101,6 +101,7 @@ s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/ s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/ s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/ +s/^#undef EMACS_CONFIG_FEATURES *$/#define EMACS_CONFIG_FEATURES ""/ s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ /^#undef HAVE_INTTYPES_H/c\ @@ -115,12 +116,14 @@ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ #else\ #undef HAVE_STDINT_H\ #endif +s/^#undef HAVE_C_VARARRAYS *$/#define HAVE_C_VARARRAYS 1/ s/^#undef HAVE_DECL_STRTOLL *$/#define HAVE_DECL_STRTOLL 1/ s/^#undef HAVE_DECL_STRTOULL *$/#define HAVE_DECL_STRTOULL 1/ s/^#undef HAVE_DECL_STRTOIMAX *$/#define HAVE_DECL_STRTOIMAX 1/ s/^#undef HAVE_DECL_STRTOUMAX *$/#define HAVE_DECL_STRTOUMAX 1/ s/^#undef HAVE_STRTOLL *$/#define HAVE_STRTOLL 1/ s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ +s/^#undef HAVE_PUTENV *$/#define HAVE_PUTENV 1/ /^#undef HAVE_SIGSET_T *$/s/^.*$/#define HAVE_SIGSET_T 1/ /^#undef HAVE_SNPRINTF/c\ #if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\ diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 711f8fedba6..49f2b761984 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -15,11 +15,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- -/^# DIST: /d /^SHELL *=/s/^/# / -/^CC *=/s/=.*$/=gcc/ -s/-DVERSION[^ ]* // -/^configname *=/s/=.*$/=msdos/ +/^CC *=/s/=.*$/=gcc -std=gnu99/ /^archlibdir *=/s!=.*$!=/emacs/bin! /^bindir *=/s!=.*$!=/emacs/bin! /^libdir *=/s!=.*$!=/emacs/bin! @@ -38,12 +35,17 @@ s/-DVERSION[^ ]* // /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! +/^CPPFLAGS *=/s/@CPPFLAGS@// +/^LDFLAGS *=/s/@LDFLAGS@// /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^UPDATE_MANIFEST *=/s/@UPDATE_MANIFEST@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!.exe! /^CLIENTW *=/s/@CLIENTW@// @@ -56,9 +58,6 @@ s/-DVERSION[^ ]* // /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! /^INSTALLABLES/s/emacsclient[^ ]* *// -s!^ \./! ! /^UTILITIES *=/,/^$/{ s/movemail[^ ]* *// } -/^insrcdir=/s/^.*$/\#&/ -/^ *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $(<F), diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 5df8c2776b9..a209d7ac6b9 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -19,28 +19,16 @@ /^srcdir *=/s/@[^@\n]*@/./ /^VPATH *=/s/@[^@\n]*@/./ /^MAKEINFO *=/s/@[^@\n]*@/makeinfo/ -/^INFO_EXT *=/s/@[^@\n]*@/.info/ -/^INFO_OPTS *=/s/@[^@\n]*@/--no-split/ +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ /^ENVADD/,/^$/c\ ENVADD =\ -export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\ +export TEXINPUTS := $(srcdir)";"$(texinfodir)";"$(TEXINPUTS)\ export MAKEINFO := $(MAKEINFO) $(MAKEINFO_OPTS) /^SHELL *=/s/^/# / -/^elisp.dvi:/,/^$/ { - /^ *if \[ *\a${permuted_index}/,/^ *fi *$/c\ - command.com /c 'if not a${permuted_index}==a sh ./permute-index' \ - command.com /c 'if not a${permuted_index}==a mv permuted.fns elisp.fns' \ - command.com /c 'if not a${permuted_index}==a texindex elisp.tp' \ - command.com /c 'if a${permuted_index}==a texindex elisp.??' +/^doc-emacsver:/,/^$/ { + s/emacsver\.texi\.in/emacsver.in/g + s/\.texi\.\$\$\$\$/.tmp/g + s/[^ ]*move-if-change/update/ } -/^index.texi:/,/^$/ { - /^ *if \[ *\a${permuted_index}/,/^ *fi *$/c\ - command.com /c 'if not a${permuted_index}==a cp -p ./index.perm index.texi' \ - command.com /c 'if a${permuted_index}==a cp -p ./index.unperm index.texi' -} -/^maintainer-clean:/,/^$/ { - s/^ for file in $(INFO_TARGETS)\; do rm -f.*$/ rm -f $(INFO_TARGETS)/ -} - -/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs$(INFO_EXT) mkdir ..\\..\\info| - diff --git a/msdos/sedadmin.inp b/msdos/sedadmin.inp index 95c7c0636fb..77812e8f757 100644 --- a/msdos/sedadmin.inp +++ b/msdos/sedadmin.inp @@ -15,15 +15,11 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- -/^SHELL *=/s/^/# / +/^SHELL *=/s!@SHELL@!/bin/sh! +/^AWK *=/s/@AWK@/gawk/ /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s|@[^@\n]*@|../..| /^top_builddir *=/s|@[^@\n]*@|../..| - -/^ *-if /,/^ *fi/d -/^ *if test -f charprop/,/^ *fi/c\ - rm -f uni-*.el -/^ *if test -f \${DSTDIR/,/^ *fi/c\ - rm -f ${DSTDIR}/uni-*.el ${DSTDIR}/charprop.el -/^ *cp `sed -n/c\ - cp uni-*.el ${DSTDIR} +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index fcfcd08b55e..ecbfd4a112b 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -19,6 +19,11 @@ SHELL=/xyzzy/command\ MAKESHELL=/xyzzy/command +/^EXEEXT *=/s/@EXEEXT@/.exe/ +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ + /^srcdir=/s|srcdir=@srcdir@|srcdir := $(subst \\,/,$(shell cd))| # Need a relative directory name for the md command, otherwise it @@ -33,7 +38,6 @@ s|\([ ]\)echo|\1djecho|g export EMACSLOADPATH=\ RUN_EMACS = ${EMACS} -batch --no-site-file --no-site-lisp -/^MKDIR_P *=/s,@MKDIR_P@,-command.com /c md, +/^MKDIR_P *=/s,@MKDIR_P@,gmkdir -p, -/MKDIR_P.* \${leimdir}\/.*$/s|\${leimdir}/|$(rel_leimdir)\\| -/MKDIR_P.* \$(leimdir)\/.*$/s|\$(leimdir)/|$(rel_leimdir)\\| +/^\${leimdir}\/quail \${leimdir}\/ja-dic: *$/s|\${leimdir}/|$(rel_leimdir)\\| diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index a5f938189be..9d71ef0e669 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -146,7 +146,7 @@ am__cd = cd /^ARFLAGS *=/s/@[^@\n]*@/cru/ /^AWK *=/s/@[^@\n]*@/gawk/ /^CANNOT_DUMP *=/s/@[^@\n]*@/no/ -/^CC *=/s/@[^@\n]*@/gcc/ +/^CC *=/s/@[^@\n]*@/gcc -std=gnu99/ /^CPP *=/s/@[^@\n]*@/gcc -e/ /^CPPFLAGS *=/s/@[^@\n]*@// /^CCDEPMODE *=/s/@[^@\n]*@/depmode=gcc3/ @@ -163,7 +163,6 @@ am__cd = cd /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^DEFS *=/s/@[^@\n]*@// /^DEPDIR *=/s/@[^@\n]*@/deps/ -/^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/ /^ECHO_N *=/s/@[^@\n]*@/-n/ /^EXEEXT *=/s/@[^@\n]*@/.exe/ /^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ @@ -190,7 +189,9 @@ am__cd = cd /^GNULIB_GL_UNISTD_H_GETOPT *=/s/@GNULIB_GL_UNISTD_H_GETOPT@/1/ /^GNULIB_MEMRCHR *=/s/@GNULIB_MEMRCHR@/1/ /^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/1/ +/^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/1/ /^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/ +/^GNULIB_TIME_RZ *=/s/@GNULIB_TIME_RZ@/1/ /^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/ /^GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/ /^GSETTINGS_CFLAGS *=/s/@[^@\n]*@// @@ -218,6 +219,7 @@ am__cd = cd /^HAVE_LONG_LONG_INT *=/s/@HAVE_LONG_LONG_INT@/1/ /^HAVE_LSTAT *=/s/@HAVE_LSTAT@/HAVE_LSTAT/ /^HAVE_MAKEINFO *=/s/@HAVE_MAKEINFO@/yes/ +/^HAVE_MAX_ALIGN_T *=/s/@HAVE_MAX_ALIGN_T@/0/ /^HAVE_MEMCHR *=/s/@HAVE_MEMCHR@/1/ /^HAVE_MKFIFO *=/s/@HAVE_MKFIFO@/1/ /^HAVE_MKNOD *=/s/@HAVE_MKNOD@/1/ @@ -272,8 +274,7 @@ am__cd = cd /^NEXT_AS_FIRST_DIRECTIVE_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ /^NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H *=/s/@[^@\n]*@/<signal.h>/ -/^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@// -/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@/<stddef.h>/ /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/ /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/ /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/ @@ -288,9 +289,8 @@ am__cd = cd /^NEXT_ERRNO_H *=/s/@[^@\n]*@// /^NEXT_FCNTL_H *=/s/@[^@\n]*@/<fcntl.h>/ /^NEXT_GETOPT_H *=/s/@[^@\n]*@/<getopt.h>/ -/^NEXT_STDARG_H *=/s/@[^@\n]*@// /^NEXT_SIGNAL_H *=/s/@[^@\n]*@/<signal.h>/ -/^NEXT_STDDEF_H *=/s/@[^@\n]*@// +/^NEXT_STDDEF_H *=/s/@[^@\n]*@/<stddef.h>/ /^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/ /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/ /^NEXT_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/ @@ -307,7 +307,8 @@ am__cd = cd /^PTHREAD_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^PTRDIFF_T_SUFFIX *=/s/@[^@\n]*@// /^RANLIB *=/s/@[^@\n]*@/ranlib/ -# We never want any gnulib replacement functions +/^REPLACE_MKTIME *=/s/@[^@\n]*@/1/ +# We don't want any other gnulib replacement functions /^REPLACE_[^ =]* *= *@/s/@[^@\n]*@/0/ /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@// /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/ @@ -316,15 +317,14 @@ am__cd = cd /^DIRENT_H *=/s/@[^@\n]*@// /^ERRNO_H *=/s/@[^@\n]*@// /^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ -/^STDBOOL_H *=/s/@[^@\n]*@// /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/ -/^STDARG_H *=/s/@[^@\n]*@// -/^STDDEF_H *=/s/@[^@\n]*@// +/^STDDEF_H *=/s/@[^@\n]*@/stddef.h/ /^STDINT_H *=/s/@[^@\n]*@/stdint.h/ /^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ +/^UNISTD_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^UNDEFINE_STRTOK_R *=/s/@UNDEFINE_STRTOK_R@/0/ /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/ /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// @@ -334,7 +334,7 @@ am__cd = cd /am__append_[1-9][0-9]* *=.*gettext\.h/s/@[^@\n]*@/\#/ /am__append_2 *=.*verify\.h/s/@[^@\n]*@// /^@gl_GNULIB_ENABLED_tempname_TRUE@/s/@[^@\n]*@// -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o execinfo.o/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o time_rz.o timegm.o mktime.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o execinfo.o/ /^am__append_[1-9][0-9]* *=/,/^[^ ]/{ s/ *inttypes\.h// s| *sys/select\.h|| @@ -342,13 +342,13 @@ am__cd = cd } /^am_libgnu_a_OBJECTS *=/,/^[^ ]/{ s/allocator\.\$(OBJEXT) // - s/binary-io\.\$(OBJEXT) // s/careadlinkat\.\$(OBJEXT) // s/pipe2\.\$(OBJEXT) // s/acl-errno-valid\.\$(OBJEXT) // - s/file-has-acl\.\$(OBJEXT) // + s/acl-internal\.\$(OBJEXT) // + s/get-permissions\.\$(OBJEXT) // + s/set-permissions\.\$(OBJEXT) // s/qcopy-acl\.\$(OBJEXT) // - s/qset-acl\.\$(OBJEXT) // s/openat-die\.\$(OBJEXT) // s/save-cwd\.\$(OBJEXT) // } @@ -396,13 +396,9 @@ s/^@GL_GENERATE_ERRNO_H_TRUE@/\#/ s/^@GL_GENERATE_ERRNO_H_FALSE@// s/^@GL_GENERATE_EXECINFO_H_TRUE@// s/^@GL_GENERATE_EXECINFO_H_FALSE@/\#/ -s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ -s/^@GL_GENERATE_STDBOOL_H_FALSE@// s/^@GL_GENERATE_STDALIGN_H_TRUE@// s/^@GL_GENERATE_STDALIGN_H_FALSE@/\#/ -s/^@GL_GENERATE_STDARG_H_TRUE@/\#/ -s/^@GL_GENERATE_STDARG_H_FALSE@/\#/ -s/^@GL_GENERATE_STDDEF_H_TRUE@/\#/ +s/^@GL_GENERATE_STDDEF_H_TRUE@// s/^@GL_GENERATE_STDDEF_H_FALSE@/\#/ s/^@GL_GENERATE_STDINT_H_TRUE@// s/^@GL_GENERATE_STDINT_H_FALSE@/\#/ diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index 7fa476eb072..17aa168e843 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -23,5 +23,9 @@ export FNCASE=y /^lisp *=/s|\$(srcdir)|$(CURDIR)| /^srcdir *=/s|@srcdir@|.| /^top_srcdir *=/s|@top_srcdir@|./..| +/^EXEEXT *=/s/@EXEEXT@/.exe/ /^XARGS_LIMIT *=/s|@XARGS_LIMIT@|| +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ |