diff -u -r lilypond-1.5.39.orig/stepmake/stepmake/c-vars.make lilypond-1.5.39/stepmake/stepmake/c-vars.make
--- lilypond-1.5.39.orig/stepmake/stepmake/c-vars.make	Mon Mar  4 23:12:35 2002
+++ lilypond-1.5.39/stepmake/stepmake/c-vars.make	Mon Mar  4 23:12:57 2002
@@ -13,4 +13,4 @@
 
 ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
 
-CFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
+CFLAGS = $(ICFLAGS) $(CPPFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
diff -u -r lilypond-1.5.39.orig/stepmake/stepmake/compile-vars.make lilypond-1.5.39/stepmake/stepmake/compile-vars.make
--- lilypond-1.5.39.orig/stepmake/stepmake/compile-vars.make	Mon Mar  4 23:12:35 2002
+++ lilypond-1.5.39/stepmake/stepmake/compile-vars.make	Wed Mar  6 22:58:51 2002
@@ -3,7 +3,7 @@
 LDFLAGS = $(ILDFLAGS) $(EXTRA_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(USER_LDFLAGS)
 
 PIC_FLAGS = -fpic -fPIC
-SHARED_FLAGS = -shared
+SHARED_FLAGS = -shared -flat_namespace -undefined suppress
 
 o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
 DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out) $(outdir)/$(notdir $@)"