X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=120d24d2a541fc31ab385c5c870c3c1022edfb89;hb=30c886ed7719a722a55787f955de5b28cc99517c;hp=7f91a261deb733cf356a7109f24e503c9724ecd2;hpb=9d3df03734443ed214141ca8bf4b6fc32af945a5;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 7f91a261de..120d24d2a5 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -8,11 +8,12 @@ LATEX_FILES =$(wildcard *.latex)
 # todo: add latex.
 DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
 
-EXTRA_DIST_FILES= $(LATEX_FILES)    $(wildcard *.itexi *.itely)
+EXTRA_DIST_FILES= $(LATEX_FILES)
 
 HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)
+PDF_FILES = $(DVI_FILES:.dvi=.pdf)
 
 PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES))
 
@@ -24,7 +25,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly
 # Hmm, what about?
 # local-dist: check-info
 
-info: check-info
+info: #  check-info  # -> reinstate when actively hacking doco.
 
 include $(depth)/make/stepmake.make 
 
@@ -50,50 +51,42 @@ default:
 info: $(INFO_FILES)
 
 
-# The new pretest version of makeinfo, 4.0a splits html files into their own
-# directory.  Available from
-# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
-SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a|b)')
-
-
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
+	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$@ --html $<
 	-cp -f $(outdir)/*.png $(outdir)/lilypond
 	-cp -f $(outdir)/lilypond/index.html $@
 	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
+	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$@ --html $<
 	-cp -f $(outdir)/*.png $(outdir)/lilypond-internals
 	-cp -f $(outdir)/lilypond-internals/index.html $@
 	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
-ifneq ($(SPLITTING_MAKEINFO),)
+ifeq ($(SPLITTING_MAKEINFO),yes)
 
 DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
 
 else
 
-DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
+# Links referred to by Documentation index
+LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
 
 local-WWW: deep-symlinks
 
-
-
-# Links referred to by Documentation index
-LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html
-
 deep-symlinks:
-	cd $(outdir) && rm -f lilypond && ln -s . lilypond
-	cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals
-	cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\
+	mkdir -p $(outdir)/lilypond
+	cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
 		rm -f $(i) && ln -s lilypond.html $(i) &&) true
+
 endif
 
 
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+local-WWW: $(HTML_FILES) $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
 
 local-WWW-clean: deep-WWW-clean
 
@@ -126,14 +119,14 @@ ifneq ($(CROSS),yes)
 # there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time.
 # however, this triggers compilation during install, which  is a bad thing (tm).
 
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
-	cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
+	cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose $(abs-srcdir)/ly/generate-documentation
 	-ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-	cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
+	cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
 
 else