* mf/feta-toevallig.mf: tweak for bottom of flat sign.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 568118f0a9b600e1fb899e3a166c7bca864209c2..710db8f04c5dd3270da7f122f7e518c7d318ee0a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,9 +8,10 @@ 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
 #
@@ -19,7 +20,7 @@ SCRIPTS = configure aclocal.m4 autogen.sh
 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
@@ -52,16 +53,16 @@ web-doc: web-reqs
 
 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
+install-html-doc: web-doc top-web
+       $(INSTALL) -m 755 -d $(local_package_docdir) 
+       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
 
 # KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
 my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp 
 
-
 local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
@@ -89,6 +90,7 @@ lily/$(outdir)/lilypond:
 
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
+
 web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
@@ -125,12 +127,19 @@ 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
-       cd $(builddir) && rm -rf share
+       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 && \
@@ -148,6 +157,10 @@ $(builddir)/share/lilypond-force:
                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
@@ -161,8 +174,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