X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=dfa4342c9ecffeb17db89991f15369ac5f278e80;hb=70cdb3118765db18800ab76ea62b9c187e9acd52;hp=5de72002c744677ef9bad2a68a8fcfe80e50b937;hpb=6a7d02614b0a69eac3372c78c6603197e54bcd75;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 5de72002c7..dfa4342c9e 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,7 +3,8 @@ depth=../..
 LATEX_FILES =$(call src-wildcard,*.latex)
 
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt convert-ly.txt $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES = $(LATEX_FILES) $(IMAGES) $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES += README.txt writing-texinfo.txt policy.txt
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps
@@ -21,7 +22,7 @@ HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
 # todo: add latex.
 PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 
-INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program
+INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 STEPMAKE_TEMPLATES=tex texinfo omf documentation
@@ -38,8 +39,6 @@ include $(depth)/make/stepmake.make
 
 info: $(INFO_FILES)
 
-pathsettings:
-	@echo export PATH=$(PATH)
 	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
 	@echo export PYTHONPATH=$(PYTHONPATH)
 
@@ -71,18 +70,19 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 	@echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/*png .)"
 	@echo "or add something like that to the postinstall script."
 	@echo
-else
+else # installing directly into standard /usr/...
 	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info
+	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-learning.info
 	install-info --info-dir=$(infodir) $(outdir)/lilypond.info
 	(cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .)
-endif
+endif # installing directly into standard /usr/...
 
 local-uninstall-WWW:
 	rm -f $(package_infodir)/*.png
 
-else
+else # out!=www
 
 # Cancel the default info generation rule that generates images:
 $(outdir)/%.info: # $(outdir)/%.texi
@@ -105,10 +105,11 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 	@echo
 	@echo "and read the extra instructions."
 	@echo
-else
+else # installing directly into standard /usr/...
 	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
 	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info
+	-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-learning.info
 	install-info --info-dir=$(infodir) $(outdir)/lilypond.info
 	@echo
 	@echo "***************************************************************"
@@ -116,10 +117,9 @@ else
 	@echo
 	@echo "    make out=www install-info "
 	@echo
-endif
+endif # installing into standard /usr/* root# installing into /usr/...
 
-
-endif
+endif # out!=www
 
 # All web targets, except info image symlinks and info docs are
 # installed in non-recursing target from TOP-SRC-DIR
@@ -150,6 +150,11 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
 	mkdir -p $(dir $@)
 	$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+# we /might/ switch to texi2html if it can be fixed:
+#	echo "*************************************"
+#	echo $<
+#	cd $(outdir)
+#	texi2html --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css $<
 	find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
 # symbolic links to save space
 	(cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
@@ -170,12 +175,29 @@ $(outdir)/lilypond-program/index.html: $(outdir)/lilypond-program.texi $(OUT_PNG
 # symbolic links to save space
 	(cd $(outdir)/lilypond-program/ ; ln -sf ../*.png ../*.ly . )
 
+#
+# The Learning Manual
+#
+$(outdir)/lilypond-learning/index.html: $(outdir)/lilypond-learning.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
+	mkdir -p $(dir $@)
+	$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond-learning --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	find $(outdir)/lilypond-learning/ -name '*'.png -o -name '*'.ly | xargs rm -f
+# symbolic links to save space
+	(cd $(outdir)/lilypond-learning/ ; ln -sf ../*.png ../*.ly . )
+
+
 #
 # One big page program usage
 #
 $(outdir)/lilypond-program-big-page.html: $(outdir)/lilypond-program.texi $(OUT_PNG_IMAGES)
 	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 
+#
+# One big page learning manual
+#
+$(outdir)/lilypond-learning-big-page.html: $(outdir)/lilypond-learning.texi $(OUT_PNG_IMAGES)
+	$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
+
 
 #
 # The split internals reference
@@ -212,6 +234,8 @@ $(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/lilypond-program.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
 
+$(outdir)/lilypond-learning.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
+
 $(outdir)/%.png: %.png
 	convert -depth 8 -geometry 50x50% $< $@
 
@@ -229,10 +253,11 @@ DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html\
  $(outdir)/music-glossary/index.html\
- $(outdir)/lilypond-program/index.html
+ $(outdir)/lilypond-program/index.html\
+ $(outdir)/lilypond-learning/index.html
 
 # Symlinks to refer to external source documents from split and non-split HTML
-source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source $(outdir)/lilypond-program/source
+source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source $(outdir)/lilypond-program/source $(outdir)/lilypond-learning/source
 
 $(outdir)/source:
 	@rm -f $(@)
@@ -253,12 +278,16 @@ $(outdir)/lilypond-program/source:
 	mkdir -p $(outdir)/lilypond-program
 	ln -sf ../../../ $(@)
 
+$(outdir)/lilypond-learning/source:
+	@rm -f $(@)
+	mkdir -p $(outdir)/lilypond-learning
+	ln -sf ../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
  $(datafiles) $(PDF_FILES) $(source-links) info info-dir
 
 info-dir:
-	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary lilypond-program
+	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
 
 
 $(outdir)/%.bib: %.bib