diff --git a/ChangeLog b/ChangeLog

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d448b41f8e332214409e5b7a53a656fc09b65c36..ffab58bd76996ba55cfdb697aac0430e9086b6c3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,13 +16,13 @@ SUBDIRS = buildscripts python scripts \
 ## value of DOCUMENTATION here.
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
-SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
+SCRIPTS = configure autogen.sh 
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
 TOPDOC_FILES=AUTHORS README INSTALL NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
+PATCH_FILES = emacsclient.patch server.el.patch 
 EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
@@ -33,13 +33,12 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-
 local-dist: dist-toplevel-txt-files
 
-
 dist-toplevel-txt-files:
        -mkdir -p $(distdir)
        ln $(TOPDOC_TXT_FILES) $(distdir)/
+       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
 
 doc: 
        $(MAKE) -C Documentation
@@ -51,14 +50,18 @@ install-WWW:
        $(MAKE) -C Documentation/user local-install-WWW
        $(MAKE) -C Documentation/user install-info
 
+install-help2man:
+       $(MAKE) -C scripts man install-help2man
+       $(MAKE) -C lily man install-help2man
+
 web-install:
        $(MAKE) out=www install-WWW
 
 uninstall-WWW:
-       #TODO
+       echo TODO
 
 web-uninstall:
-       $(MAKE) out=www uninstall-WWW=
+       $(MAKE) out=www uninstall-WWW
 
 local-install:
        $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
@@ -84,6 +87,7 @@ local-WWW-post:
 
        cd $(top-build-dir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
+               | grep -v 'lily-[0-9].*.pdf' \
                > $(outdir)/weblist
        ls $(outdir)/*.html >> $(outdir)/weblist
 
@@ -128,7 +132,7 @@ default: $(config_h) build-dir-setup
 build-dir-setup: $(tree-share-prefix)/lilypond-force
 
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
-HELP_CATALOGS = $(PO_FILES:$(src-depth)/po/%.po=%)
+HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
 $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
@@ -183,7 +187,10 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        touch $(tree-share-prefix)/lilypond-force
 
 $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force
-       -rm -f $(tree-share-prefix)/fonts/{otf,svg,tfm,type1}/* &&  \
+       -rm -f $(tree-share-prefix)/fonts/otf/* &&  \
+       rm -f $(tree-share-prefix)/fonts/svg/* &&  \
+       rm -f $(tree-share-prefix)/fonts/tfm/* &&  \
+       rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
                ln -s ../../../../../../mf/$(outconfbase)/*.otf .
        -cd $(tree-share-prefix)/fonts/svg && \