[Emacs-diffs] /srv/bzr/emacs/trunk r100251: Some msdos build fixes (hopefully, possibly, ...)

[Glenn Morris]

------------------------------------------------------------
revno: 100251
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-05-12 20:55:46 -0700
message:
  Some msdos build fixes (hopefully, possibly, ...)
  
  * msdos/sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
  (LIBXMENU): Edit to ${OLDXMENU}.
  (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
modified:
  msdos/ChangeLog
  msdos/sed1x.inp

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-13 02:50:20 +0000
+++ b/msdos/ChangeLog   2010-05-13 03:55:46 +0000
@@ -1,5 +1,9 @@
 2010-05-13  Glenn Morris  <address@hidden>
 
+       * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
+       (LIBXMENU): Edit to ${OLDXMENU}.
+       (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
+
        * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
        (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
        (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)

=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp   2010-05-11 02:51:08 +0000
+++ b/msdos/sed1x.inp   2010-05-13 03:55:46 +0000
@@ -4,7 +4,9 @@
 s!^    cd \${oldXMenudir}; \${MAKE}.*$!        ${MAKE} -C ${oldXMenudir}.!
 s!^    @true *$!       @rem!
 s/DOC/DOC-X/g
-#/^LIBXMENU *=/s!= *!= ../oldxmenu/!
+/^OLDXMENU *=/address@hidden@!${oldXMenudir}libXMenu11.a!
+/^LIBXMENU *=/address@hidden@!${OLDXMENU}!
+/^LIBX_OTHER *=/address@hidden@!${LIBXT} ${LIBX_EXTRA}!
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
 /^temacs *:/s!OLDXMENU!LIBXMENU!