diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-15 15:01:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-15 15:01:22 -0700 |
| commit | 3545021dd51a335e12e2e63bf69c59b611e5c615 (patch) | |
| tree | 3fc05b375520db066901f010cc2a99dd3589290a /msdos | |
| parent | 9fad8b97fd664eb5ec7118f767660c177fb66db1 (diff) | |
| download | emacs-3545021dd51a335e12e2e63bf69c59b611e5c615.tar.gz | |
Always define OLDXMENU in src/Makefile.in.
* src/Makefile.in (OLDXMENU): Always define.
* msdos/sed1v2.inp (OLDXMENU): Edit to empty.
* msdos/sed1x.inp (OLDXMENU): Expect empty initial value.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index ecc615b96b3..85c9f594311 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,8 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (OLDXMENU): Edit to empty. + * sed1x.inp (OLDXMENU): Expect empty initial value. + * sed1v2.inp (LIBX_OTHER): Edit to empty. * sed1x.inp (LIBX_OTHER): Expect empty initial value. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 899af98ef67..836df145fa5 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -112,6 +112,7 @@ s/\.h\.in/.h-in/ /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ +/^OLDXMENU *=/s/@OLDXMENU@// /^LIBX_OTHER *=/s/@LIBX_OTHER@// /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 1eca4e819cb..ecb8828cc23 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -4,7 +4,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! s!^ @true *$! @rem! s/DOC/DOC-X/g -/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! +/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! |