]> git.donarmstrong.com Git - lilypond.git/blobdiff - Documentation/user/GNUmakefile
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
[lilypond.git] / Documentation / user / GNUmakefile
index f94800161cf37f1577e46ff92e25bde34fb85717..4ba6660a17977170da803e7aca54289861552631 100644 (file)
@@ -24,11 +24,13 @@ PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 # this prevents aux files from being reused for translated docs
 TEXI2PDF_FLAGS = --tidy
 
+MAIN_INFO_DOC = lilypond
 INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
+DEST_INFO_IMAGES_SUBDIR = Documentation/user
 endif
 
 STEPMAKE_TEMPLATES=tex texinfo omf documentation
@@ -36,10 +38,6 @@ OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
-
-TEXINPUTS=$(top-src-dir)/tex::
-export TEXINPUTS
-
 include $(depth)/make/stepmake.make
 
 info: $(INFO_FILES)
@@ -48,80 +46,6 @@ info: $(INFO_FILES)
 
 xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
 
-# There are two modes for info: with and without images.
-ifeq ($(out),www)
-
-# This builds all .info targets with images, in out-www.
-# Viewable with a recent Emacs, doing: C-u C-h i out-www/lilypond.info
-
-local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(infodir)
-ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
-## Can not have absolute symlinks because some binary packages build schemes
-## install files in nonstandard root.  Best we can do is to notify the
-## builder or packager.
-       @echo
-       @echo "***************************************************************"
-       @echo "Please add or update the LilyPond direntries, do"
-       @echo
-       @echo "    install-info --info-dir=$(infodir) $(outdir)/lilypond.info"
-       @echo
-       @echo "For images in the INFO docs to work, do: "
-       @echo
-       @echo "    (cd $(infodir) && ln -sfT ../doc/lilypond/html/Documentation/user lilypond)"
-       @echo "or add something like that to the postinstall script."
-       @echo
-else # installing directly into standard /usr/...
-       -$(INSTALL) -d $(DESTDIR)$(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 --remove --info-dir=$(infodir) $(outdir)/lilypond-internals.info
-       -install-info --remove --info-dir=$(infodir) $(outdir)/music-glossary.info
-       install-info --info-dir=$(infodir) $(outdir)/lilypond.info
-       cd $(infodir) && ln -sfT $(webdir)/Documentation/user lilypond
-endif # installing directly into standard /usr/...
-
-local-uninstall-WWW:
-       rm -f $(infodir)/lilypond
-
-else # out!=www
-
-local-install-info: info
-       -$(INSTALL) -d $(DESTDIR)$(package_infodir)
-ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
-## Can not have absolute symlinks because some binary packages build schemes
-## install files in nonstandard root.  Best we can do is to notify the
-## builder or packager.
-       @echo
-       @echo "***************************************************************"
-       @echo "Please add or update the LilyPond direntries, do"
-       @echo
-       @echo "    install-info --info-dir=$(infodir) out/lilypond.info"
-       @echo
-       @echo "For images in the INFO docs to work, do"
-       @echo
-       @echo "    make out=www install-info "
-       @echo
-       @echo "and read the extra instructions."
-       @echo
-else # installing directly into standard /usr/...
-       -$(INSTALL) -d $(DESTDIR)$(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 --remove --info-dir=$(infodir) $(outdir)/lilypond-internals.info
-       -install-info --remove --info-dir=$(infodir) $(outdir)/music-glossary.info
-       install-info --info-dir=$(infodir) $(outdir)/lilypond.info
-       @echo
-       @echo "***************************************************************"
-       @echo "For images in the INFO docs to work, do"
-       @echo
-       @echo "    make out=www install-info "
-       @echo
-endif # installing into standard /usr/* root# installing into /usr/...
-
-endif # out!=www
 
 # All web targets, except info image symlinks and info docs are
 # installed in non-recursing target from TOP-SRC-DIR
@@ -145,7 +69,6 @@ extra-local-help:
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi
-$(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 
 #
 # Split manuals in HTML
@@ -191,7 +114,8 @@ DEEP_HTML_FILES =\
  $(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 $(outdir)/lilypond-learning/source
+source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source \
+ $(outdir)/lilypond-program/source $(outdir)/lilypond-learning/source
 
 $(outdir)/source:
        @rm -f $(@)
@@ -214,7 +138,6 @@ $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
        $(MAKE) -C $(top-src-dir)/mf
 
 $(outdir)/lilypond.texi $(outdir)/lilypond-program.texi $(outdir)/lilypond-learning.texi $(outdir)/music-glossary.texi: $(ITELY_FILES) $(ITEXI_FILES)
-$(outdir)/lilypond.nexi $(outdir)/lilypond-program.nexi $(outdir)/lilypond-learning.nexi $(outdir)/music-glossary.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
 
 # Rules for the automatically generated documentation
@@ -223,10 +146,8 @@ $(outdir)/lilypond.nexi $(outdir)/lilypond-program.nexi $(outdir)/lilypond-learn
 # 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: $(LILYPOND_BINARY)
+$(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
        cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
-       rm -f $(outdir)/lilypond-internals.nexi
-       -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused