X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=17182a879348816aee09b49577ec56022646dfe0;hb=24cbd04954feea8c67e10c12a5a7ef1d3cee9a1b;hp=8052ff25931239ed0889b9200226f68f7497cd10;hpb=eb56b6930fba0e2b8192e4aef6c569c85970deaa;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8052ff2593..17182a8793 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,22 +9,21 @@ SUBDIRS = buildscripts python scripts \
 	po make \
 	elisp vim \
 	input \
-	cygwin stepmake $(documentation-dir)
+	stepmake $(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
 ## value of DOCUMENTATION here.
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
-SCRIPTS = configure 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
-EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
+EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -33,7 +32,12 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-local-dist: dist-toplevel-txt-files
+local-dist: dist-toplevel-txt-files 
+
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make)
+	echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
 	-mkdir -p $(distdir)
@@ -50,14 +54,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)
@@ -83,6 +91,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
 
@@ -127,7 +136,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
@@ -182,7 +191,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 && \