diff options
| author | Glenn Morris | 2010-05-15 14:47:58 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-15 14:47:58 -0700 |
| commit | 02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0 (patch) | |
| tree | 12531412841909cdd3556cb7394cc653e730e851 /msdos | |
| parent | 5929fbe7665a873ba101e3363a9db35f8508efda (diff) | |
| download | emacs-02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0.tar.gz emacs-02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0.zip | |
Always define LIBX_OTHER in src/Makefile.in.
* src/Makefile.in (LIBX_OTHER): Always define.
* msdos/sed1v2.inp (LIBX_OTHER): Edit to empty.
* msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 3a10a8ada11..899af98ef67 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -112,6 +112,7 @@ s/\.h\.in/.h-in/ | |||
| 112 | /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// | 112 | /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// |
| 113 | /^LIBGPM *=/s/@LIBGPM@// | 113 | /^LIBGPM *=/s/@LIBGPM@// |
| 114 | /^EXEEXT *=/s/@EXEEXT@/.exe/ | 114 | /^EXEEXT *=/s/@EXEEXT@/.exe/ |
| 115 | /^LIBX_OTHER *=/s/@LIBX_OTHER@// | ||
| 115 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ | 116 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ |
| 116 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ | 117 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ |
| 117 | /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ | 118 | /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ |
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index cb86d0251cb..1eca4e819cb 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp | |||
| @@ -6,7 +6,7 @@ s!^ @true *$! @rem! | |||
| 6 | s/DOC/DOC-X/g | 6 | s/DOC/DOC-X/g |
| 7 | /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! | 7 | /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! |
| 8 | /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! | 8 | /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! |
| 9 | /^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! | 9 | /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! |
| 10 | /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! | 10 | /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! |
| 11 | /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! | 11 | /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! |
| 12 | /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! | 12 | /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! |