diff -ruN lilypond-2.7.15-orig/kpath-guile/kpath.c lilypond-2.7.15/kpath-guile/kpath.c
--- lilypond-2.7.15-orig/kpath-guile/kpath.c	Mon Aug 15 00:27:53 2005
+++ lilypond-2.7.15/kpath-guile/kpath.c	Sun Nov  6 13:18:55 2005
@@ -111,7 +111,7 @@
 }
 
 
-static char const* LIBKPATHSEA = "libkpathsea.so";
+static char const* LIBKPATHSEA = "libkpathsea.dylib";
 
 int
 open_library ()
diff -ruN lilypond-2.7.15-orig/lexer-gcc-3.1.sh lilypond-2.7.15/lexer-gcc-3.1.sh
--- lilypond-2.7.15-orig/lexer-gcc-3.1.sh	Sun May  8 15:07:41 2005
+++ lilypond-2.7.15/lexer-gcc-3.1.sh	Sun Nov  6 10:29:22 2005
@@ -8,7 +8,7 @@
 
 if [ -z "$FLEXLEXER" ]; then
 
-includes="$HOME/usr/include $PREFIX/include /usr/local/include /usr/include" 
+includes="$HOME/usr/include /usr/local/teTeX/include /sw/include $PREFIX/include /usr/local/include /usr/include" 
 
 for i in $includes; do
     file=$i/FlexLexer.h
@@ -45,7 +45,7 @@
 rm -f lily/$outdir/FlexLexer.h
 perl -p -e 's/iostream.h/iostream/g;' \
     -e 's/\bistream\b/std::istream/g;' \
-    -e 's/\bostream\b/std::ostream/' \
+    -e 's/\bostream\b/std::ostream/g' \
     $file > lily/$outdir/FlexLexer.h
 echo "done"
 
diff -ruN lilypond-2.7.15-orig/stepmake/stepmake/c++-rules.make lilypond-2.7.15/stepmake/stepmake/c++-rules.make
--- lilypond-2.7.15-orig/stepmake/stepmake/c++-rules.make	Thu May 12 14:04:53 2005
+++ lilypond-2.7.15/stepmake/stepmake/c++-rules.make	Sun Nov  6 10:34:31 2005
@@ -26,6 +26,8 @@
 
 $(outdir)/%.cc: %.ll
 	$(FLEX) -Cfe -p -p -o$@ $< 
+	perl -i.bak -pe 's/^class istream;/#include <iostream>;\nusing namespace std;/' $@
 
 $(outdir)/%-rc.o: $(outdir)/%.rc
 	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<
+
diff -ruN lilypond-2.7.15-orig/stepmake/stepmake/compile-vars.make lilypond-2.7.15/stepmake/stepmake/compile-vars.make
--- lilypond-2.7.15-orig/stepmake/stepmake/compile-vars.make	Wed Nov  2 11:23:47 2005
+++ lilypond-2.7.15/stepmake/stepmake/compile-vars.make	Sun Nov  6 10:15:01 2005
@@ -3,11 +3,7 @@
 ALL_LDFLAGS = $(LDFLAGS) $(CONFIG_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(CONFIG_LDFLAGS)
 
 PIC_FLAGS = -fpic -fPIC
-ifeq ($(MINGW_BUILD),)
-SHARED_FLAGS = -shared
-else
-SHARED_FLAGS = -mdll
-endif
+SHARED_FLAGS = -bundle -flat-namespace -undefined dynamic_lookup
 
 o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
 DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out) $(outdir)/$(notdir $@)"