X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=2f768d56b19fcdb09f9ee7bb3d7c08b3de486718;hb=adb84c62feff223cf174b71f31b3e4e15b726a0c;hp=1a5613ff98c38b5aa5bea2d0d507977bdf0926fe;hpb=08387796094cf8c92ae74f99d6dd96aa40461568;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1a5613ff98..2f768d56b1 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,7 +10,7 @@ depth = .
 # 
 SUBDIRS = buildscripts python scripts \
 	elisp \
-	flower kpath-guile ttftool lily \
+	flower kpath-guile lily \
 	mf ly tex ps scm \
 	po make \
 	cygwin debian stepmake \
@@ -18,8 +18,8 @@ SUBDIRS = buildscripts python scripts \
 	vim 
 #
 
-include VERSION
-package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+#include VERSION
+#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS HACKING
@@ -60,11 +60,7 @@ local-install:
 	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
 
 final-install:
-	@echo '*** Before using LilyPond, the contents of one of the login scripts'
-	@echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.'
-	@echo '*** LilyPond should have been installed to do that automatically'
-	@echo '*** when you log in.  So, please log out now and log in again.'
-	@echo '*** For more information see Invoking LilyPond in the manual.'
+	@true
 
 web-ext = html midi pdf png txt ly
 
@@ -102,7 +98,7 @@ PO_FILES = $(wildcard $(srcdir)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-prefix)/lilypond-force: GNUmakefile
+$(tree-prefix)/lilypond-force link-tree: GNUmakefile
 # Preparing LilyPond tree for builddir exec
 	cd $(builddir) && rm -rf lib share
 	mkdir -p $(builddir)/lib/$(package)
@@ -110,15 +106,17 @@ $(tree-prefix)/lilypond-force: GNUmakefile
 	mkdir -p $(tree-prefix)/dvips
 	mkdir -p $(tree-prefix)/elisp
 	mkdir -p $(tree-prefix)/fonts
+	mkdir -p $(tree-prefix)/fonts/otf
+	mkdir -p $(tree-prefix)/fonts/tfm
+	mkdir -p $(tree-prefix)/fonts/type1
+	mkdir -p $(tree-prefix)/fonts/svg
+	mkdir -p $(tree-prefix)/fonts/map
+	mkdir -p $(tree-prefix)/fonts/enc
 	mkdir -p $(tree-prefix)/tex
 	cd $(builddir)/lib && \
 		ln -s  ../../../python/$(outconfbase) python
 	cd $(tree-prefix) && \
 		ln -s $(abs-srcdir)/ly ly && \
-		ln -s ../../../mf/$(outconfbase) otf && \
-		ln -s ../../../mf/$(outconfbase) svg && \
-		ln -s ../../../mf/$(outconfbase) tfm && \
-		ln -s $(abs-srcdir)/mf && \
 		ln -s $(abs-srcdir)/ps && \
 		ln -s ../../../python/$(outconfbase) python && \
 		ln -s $(abs-srcdir)/scm && \
@@ -130,28 +128,32 @@ $(tree-prefix)/lilypond-force: GNUmakefile
 		ln -s $(abs-srcdir)/tex source && \
 		ln -s ../../../../tex/$(outconfbase) tex-out && \
 		ln -s ../../../../mf/$(outconfbase) mf-out
+	-cd $(tree-prefix)/fonts/otf && \
+		ln -s ../../../../../mf/$(outconfbase)/*.otf .
+	-cd $(tree-prefix)/fonts/svg && \
+		ln -s ../../../../../mf/$(outconfbase)/*.svg .
+	-cd $(tree-prefix)/fonts/tfm && \
+		ln -s ../../../../../mf/$(outconfbase)/*.tfm .
+	-cd $(tree-prefix)/fonts/type1 && \
+		ln -s ../../../../../mf/$(outconfbase)/*.pfa .
 	cd $(tree-prefix)/fonts && \
 		ln -s $(abs-srcdir)/mf source && \
-		ln -s ../../../../tex/$(outconfbase) enc && \
-		ln -s ../../../../mf/$(outconfbase) map && \
-		ln -s ../../../../mf/$(outconfbase) otf && \
-		ln -s ../../../../mf/$(outconfbase) tfm && \
-		ln -s ../../../../mf/$(outconfbase) svg && \
-		ln -s ../../../../mf/$(outconfbase) type1
-	cd $(tree-prefix)/elisp && \
+		true
+	-cd $(tree-prefix)/elisp && \
 		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
 		ln -s $(abs-srcdir)/elisp/*.el .
 	$(foreach i,$(CATALOGS), \
 		mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \
 		cd $(share-prefix)/locale/$i/LC_MESSAGES && \
 		ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
-	touch $@
+#	touch $@
+	touch $(tree-prefix)/lilypond-force
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
 	cd $(builddir) && rm -rf share
 
-$(config_h): config.hh.in 
+$(config_h): config.hh.in
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,