(outdir)/latin1.enc: Build fix:

merge stderr with stdout.

diff --git a/ChangeLog b/ChangeLog
index b670bfe5ebc14f907364cdd8bab2f4cc052fa914..a7c56f3cb7b003b4a4c9c5b69e3fe956333d7b88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * tex/GNUmakefile $(outdir)/latin1.enc: Build fix:
+       merge stderr with stdout.  
+
+2005-03-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/libc-extension.cc: Tested BSD compile fix (Matthias Neeracher).
+
 2005-02-29  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/instrument-notation.teily: moved

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 48b6235a0ebbe338fe713416000d88305854fb76..a5085047c315e64c047a93bd4cb1fdd407efc392 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -1,7 +1,6 @@
 /*
   libc-extension.cc --  compensate for lacking libc functions.
 
-
   source file of the flowerlib
 
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
@@ -163,9 +162,9 @@ extern "C" {
 #if HAVE_FUNOPEN
   
   FILE *
-  fopencookie (void *cookie, char const *mode, cookie_io_functions_t *fun)
+  fopencookie (void *cookie, char const *mode, cookie_io_functions_t fun)
   {
-    return funopen (cookie, fun->read, fun->write, fun->seek, fun->close);
+    return funopen (cookie, fun.read, fun.write, fun.seek, fun.close);
   }
 
 #else /* ! HAVE_FUNOPEN */

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 239f4f8f9be7496eef4162ae0b36948cd6070361..e264e958b69b4afaa6d092d75b169b8e4ffdc458 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -20,7 +20,7 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps
 $(outdir)/latin1.enc: GNUmakefile
        echo '/ISOLatin1Encoding' > $@.orig
        echo 'ISOLatin1Encoding pstack' \
-         | gs -sDEVICE=nullpage  -quiet - 2>> $@.orig
+         | gs -sDEVICE=nullpage  -quiet - >> $@.orig 2>&1
        echo 'def' >> $@.orig
        sed 's|/minus|/hyphen|' < $@.orig > $@