X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=0af9324cadaaa5f11ab0a1d419842d7b45f4701f;hb=4c3c7a9cc63988f428ff435fed024cab4d247544;hp=f590fbf4685b769f0448848f63086464a4c1d43f;hpb=968137c99bf549d66190610fccfce45c216fc02c;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f590fbf468..0af9324cad 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,18 +8,19 @@ depth = .
 
 # descent order into subdirectories
 # 
-SUBDIRS = buildscripts scripts flower lily \
+SUBDIRS = buildscripts python scripts \
+	flower lily \
 	mf ly tex ps scm \
-	python po make \
+	po make \
 	cygwin debian $(builddir)/stepmake \
 	Documentation input
 #
 
 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
+README_FILES =  ChangeLog  COPYING DEDICATION NEWS README.mandrake ROADMAP THANKS
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -43,28 +44,17 @@ web-reqs: run-reqs pfa-fonts
 doc: run-reqs
 	$(MAKE) -C Documentation
 
-web-doc: web-reqs
-	$(MAKE) out=www -C Documentation WWW
-	$(MAKE) footify
-
 pfa-fonts:
 	$(MAKE) MAKE_PFA_FILES=1 -C mf
+	(cd $(builddir)/share/lilypond/fonts && \
+		tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
 
-docdir = $(prefix)/share/doc/lilypond-$(TOPLEVEL_VERSION)
-install-html-doc: html-doc
-	$(INSTALL) -d $(docdir)/html 
-	tar -C $(docdir)/html -zxf $(outdir)/web.tar.gz
-
-# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
-my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
-
+install-html-doc: top-web
+	$(INSTALL) -m 755 -d $(local_package_docdir) 
+	tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
 
 local-install:
 	$(INSTALL) -d $(local_lilypond_datadir)
-ifeq ($(KPATHSEA),0)
-	$(foreach i, 1 2 3 4 5, rm -f $(local_lilypond_datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(local_lilypond_datadir)/tfm.$(i) ; )
-endif
-
 
 final-install:
 	@echo
@@ -84,14 +74,16 @@ lily: lily/$(outdir)/lilypond
 lily/$(outdir)/lilypond:
 	$(MAKE) -C lily
 
-local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
+local-web: $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
-web-ext = gz html midi pdf png txt
+
+web-ext = gz html midi pdf png txt ly
 top-web:
 	cd $(builddir) && rm -f `find . -name \*.html~ -print`
 	cd $(builddir) && find Documentation input \
 		$(web-ext:%=-path '*/out-www/*.%' -or) -false \
 		> $(outdir)/weblist
+	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/
 	cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
 	cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
@@ -121,34 +113,45 @@ default: $(config_h) builddir-setup
 
 builddir-setup: $(builddir)/share/lilypond-force
 
+PO_FILES = $(wildcard $(srcdir)/po/*.po)
+HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
+CATALOGS = $(HELP_CATALOGS:lilypond=) 
+
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
-	@echo Making $(builddir)/share 
-	@cd $(builddir) && rm -rf share
-	@mkdir -p $(builddir)/share/lilypond
-	@mkdir -p $(builddir)/share/lilypond/fonts
-	@mkdir -p $(builddir)/share/lilypond/tex
-	@cd $(builddir)/share/lilypond && \
+	cd $(builddir) && rm -rf lib share
+	mkdir -p $(builddir)/lib/lilypond
+	mkdir -p $(builddir)/share/lilypond
+	mkdir -p $(builddir)/share/lilypond/fonts
+	mkdir -p $(builddir)/share/lilypond/tex
+	cd $(builddir)/lib/lilypond && \
+		ln -s  ../../python/$(outconfbase) python
+	cd $(builddir)/share/lilypond && \
 		ln -s $(abs-srcdir)/ly ly && \
 		ln -s ../../mf/$(outconfbase) dvips && \
 		ln -s ../../mf/$(outconfbase) afm && \
 		ln -s ../../mf/$(outconfbase) tfm && \
 		ln -s $(abs-srcdir)/mf && \
 		ln -s $(abs-srcdir)/ps && \
-		ln -s ../../python/out python && \
+		ln -s ../../python/$(outconfbase) python && \
 		ln -s $(abs-srcdir)/scm
-	@cd $(builddir)/share/lilypond/tex && \
+	cd $(builddir)/share/lilypond/tex && \
 		ln -s $(abs-srcdir)/tex source && \
 		ln -s ../../../mf/$(outconfbase) generate
-	@cd $(builddir)/share/lilypond/fonts && \
+	cd $(builddir)/share/lilypond/fonts && \
 		ln -s $(abs-srcdir)/mf source && \
 		ln -s ../../../mf/$(outconfbase) afm && \
 		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s ../../../mf/$(outconfbase) type1
+	$(foreach i,$(CATALOGS), \
+		mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \
+		cd $(builddir)/share/locale/$i/LC_MESSAGES && \
+		ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
+	touch $@
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
-	@cd $(builddir) && rm -rf share
+	cd $(builddir) && rm -rf share
 
 $(config_h): configure.in aclocal.m4
 #
@@ -157,8 +160,8 @@ $(config_h): configure.in aclocal.m4
 # and they blindly run "cvs update; make".
 #
 	@echo
-	@echo ' *** config.h is out of date'
+	@echo ' *** $(config_h) is out of date'
 	@echo ' *** Remove it and rerun autogen:'
-	@echo '         rm config.h; ./autogen.sh'
+	@echo '         rm $(config_h); ./autogen.sh'
 	@echo
 	@false