X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=ba19ac9559e90cd2a4f16e668df11a482c7dcb59;hb=608c933383697574c61efe2e9c47982f23ee2ee2;hp=1872af74ce740499b504667e426d916c0935a12c;hpb=67e5286be2fdc1cd6d90dfc233663c284ced8ca8;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 1872af74ce..ba19ac9559 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -2,14 +2,10 @@
 depth = ..
 
 NAME = lilypond
-SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower
 MODULE_INCLUDES= $(depth)/flower/include
 
-# need this to convert between function pointers and member function pointers.
-MODULE_CXXFLAGS= -Wno-pmf-conversions 
-
 
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES=c c++ executable po help2man
@@ -78,6 +74,11 @@ endif
 $(outdir)/lexer.cc: $(config_h)
 $(outdir)/parser.cc: $(config_h)
 
+ifneq ($(LILYPOND_EXTERNAL_BINARY),)
+$(outdir)/lilypond.1: $(LILYPOND_EXTERNAL_BINARY) $(buildscript-dir)/help2man
+	$(buildscript-dir)/help2man $(LILYPOND_EXTERNAL_BINARY) > $@
+endif
+
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh