lilypond-1.3.72

diff --git a/make/toplevel.make.in b/make/toplevel.make.in
index dd38191b509f6bb52055d2bd3af45651a1a8901d..3e6ae7f4e15b8cb1fb4ecdbfca59b0b0a92b6ba1 100644 (file)
--- a/make/toplevel.make.in
+++ b/make/toplevel.make.in
@@ -26,7 +26,7 @@ STEPMAKE_TEMPLATES=toplevel yolily-toplevel po
 include $(depth)/make/stepmake.make 
 #
 
-website: fonts htmldoc examples doc++ footify
+website: fonts htmldoc examples  footify
 
 footify:
        $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
@@ -50,19 +50,20 @@ htmldoc:
 examples:
        $(MAKE) out='www' -C input WWW
        $(MAKE) out='www' -C mutopia WWW
-       # arg, should not break concept of recursive make;
-       # this breaks links (and dependencies, see above)
+# arg, should not break concept of recursive make;
+# this breaks links (and dependencies, see above)
+
+# don't understand this comment --hwn
+
        $(PYTHON) $(buildscripts)/mutopia-index.py -o short-examples.html input/
        $(PYTHON) $(buildscripts)/mutopia-index.py -o long-examples.html mutopia/
-       #$(footify-all-command)
+#$(footify-all-command)
        $(footify) --index=./ `$(FIND) . -name '*.html' -print`
        tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html  `find input mutopia -type d -name 'out-www' -print`
 
 
-my_tfm_path=$(TFM_PATH) /tmp /tmp  /tmp /tmp  /tmp /tmp 
 localinstall:
        mkdir -p $(datadir)
-       $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
 
 local-WWW-clean:
        $(SHELL) $(depth)/buildscripts/clean-fonts.sh

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 2c812c8ceb281a3249bff2e11bd463910c41d015..5552912e20617afb24d48b06e0fc2ee7e9701ffc 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,7 +1,7 @@
 # title           generic make targets
 # file    make/Targets.make
 
-.PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
+.PHONY : all clean config default dist doc exe help html lib TAGS\
         po
 
 all:    default
@@ -62,7 +62,6 @@ help: generic-help local-help
   dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
   distclean   cleaner than clean (duh)\n\
   doc         update all documentation\n\
-  doc++       make doc++ documentation\n\
   exe         update all executables\n\
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
@@ -87,15 +86,6 @@ doc: local-doc
 
 local-doc:
 
-# Ugh.  C++ specific.
-# If you're not the maintainer, there's no tarball in $(outdir)!
-# Maybe, there is one in ../releases
-doc++:
-       (cd $(outdir); \
-               $(SHELL) ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz || \
-               $(SHELL) ../$(step-bindir)/tar-docxx.sh $(release-dir)/$(package)-$(TOPLEVEL_VERSION).tar.gz)
-
-
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        mkdir -p $(distdir)/$(localdir)
        $(LN) $(DIST_FILES) $(distdir)/$(localdir)