*** empty log message ***

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e6bd49b4d60b01937ec9696d1301bcebd095b9c5..0dccb785d22c9096ac5471076d5a78b80e4fb77d 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -73,13 +73,7 @@ footifymail = MAILADDRESS=bug-lilypond@gnu.org
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
-       echo 'AddDefaultCharset utf-8\
-AddCharset utf-8 .html\
-AddCharset utf-8 .en\
-AddCharset utf-8 .nl\
-AddCharset utf-8 .txt' > .htaccess 
-
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
+       echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(builddir)/.htaccess  $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
        cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
        cd $(builddir) && find . -name \*.html~ -print | xargs rm -f
        cd $(builddir) && find Documentation input \
@@ -90,6 +84,7 @@ AddCharset utf-8 .txt' > .htaccess
        cd $(builddir) && ls *.html >> $(outdir)/weblist
        cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
+share-prefix = $(builddir)/share
 tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
@@ -106,7 +101,7 @@ PO_FILES = $(wildcard $(srcdir)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-prefix)/lilypond-force:
+$(tree-prefix)/lilypond-force: GNUmakefile
 # Preparing LilyPond tree for builddir exec
        cd $(builddir) && rm -rf lib share
        mkdir -p $(builddir)/lib/$(package)
@@ -116,38 +111,39 @@ $(tree-prefix)/lilypond-force:
        mkdir -p $(tree-prefix)/fonts
        mkdir -p $(tree-prefix)/tex
        cd $(builddir)/lib && \
-               ln -s  ../../python/$(outconfbase) python
+               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 ../../../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
+               ln -s ../../../python/$(outconfbase) python && \
+               ln -s $(abs-srcdir)/scm && \
+               ln -s $(abs-srcdir)/scripts scripts
        cd $(tree-prefix)/dvips && \
-               ln -s ./../mf/$(outconfbase) mf-out && \
+               ln -s ./../../mf/$(outconfbase) mf-out && \
                ln -s $(abs-srcdir)/ps
        cd $(tree-prefix)/tex && \
                ln -s $(abs-srcdir)/tex source && \
-               ln -s ../../../tex/$(outconfbase) tex-out && \
-               ln -s ../../../mf/$(outconfbase) mf-out
+               ln -s ../../../../tex/$(outconfbase) tex-out && \
+               ln -s ../../../../mf/$(outconfbase) mf-out
        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
+               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 && \
-               ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \
+               ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
                ln -s $(abs-srcdir)/elisp/*.el .
        $(foreach i,$(CATALOGS), \
-               mkdir -p $(tree-prefix)/locale/$i/LC_MESSAGES && \
-               cd $(tree-prefix)/locale/$i/LC_MESSAGES && \
-               ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
+               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 $@
 
 local-clean: builddir-setup-clean