X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=1313689a2c8815dbdc3b67f34d620ef9e3c50cf6;hb=e63ea5ba4dfc0ecf69e0211dc0327503dfc05037;hp=9b7cdd7ed328fba1fdb3cce703539f58b78c0ff4;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9b7cdd7ed3..1313689a2c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -13,14 +13,14 @@ SUBDIRS = buildscripts scripts flower lily \
 	python po make intl \
 	debian $(builddir)/stepmake \
 	Documentation input \
-	mutopia ports
+	mutopia 
 #
 
-SCRIPTS = configure aclocal.m4
+SCRIPTS = configure aclocal.m4 autogen.sh
 README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch .cvsignore
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -35,13 +35,14 @@ footify:
 	$(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
 	$(footify-all-command)
 
+
 fonts:
 	$(MAKE) -C $(depth)/mf
 
 doc: lily fonts
 	$(MAKE) -C Documentation
 
-web-doc: 
+web-doc: pfa-fonts
 	$(MAKE) out=www -C Documentation WWW
 	$(MAKE) footify
 
@@ -60,21 +61,24 @@ TOP_HTMLS = index.html short-examples.html long-examples.html
 
 index: web-doc
 
-short-examples:
+short-examples: pfa-fonts
 	$(MAKE) out=www -C input WWW
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
 
 
-long-examples:
+long-examples: pfa-fonts
 	$(MAKE) out=www -C mutopia WWW
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
 
+pfa-fonts:
+	$(MAKE) MAKE_PFA_FILES=1 -C mf
+
 lily: lily/$(outdir)/lilypond
 
 lily/$(outdir)/lilypond:
 	$(MAKE) -C lily
 
-local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+local-web: fontpaths fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
 top-web:
 	rm -f `find . -name \*.html~ -print`
@@ -109,3 +113,12 @@ top-WWW-clean:
 
 
 WWW:
+
+fontpaths:
+	-ln -s $(depth)/mf/out dvips
+	-mkdir -p fonts
+	-rm fonts/source
+	-ln -s ../$(depth)/mf fonts/source
+	-ln -s ../$(depth)/mf/out fonts/afm
+	-ln -s ../$(depth)/mf/out fonts/tfm
+	-ln -s ../$(depth)/mf/out fonts/type1