test

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1db4a343c1ad39161a6b2e22a5cebf58691ab2d8..d3faf38932d91c7bd184a7b974b4c76edcff3ec4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,8 +10,8 @@ depth = .
 # 
 SUBDIRS = buildscripts scripts flower lily \
        mf ly tex ps scm \
-       python po make intl \
-       debian $(builddir)/stepmake \
+       python po make \
+       cygwin debian $(builddir)/stepmake \
        Documentation input
 #
 
@@ -19,9 +19,9 @@ 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 darwin.patch .cvsignore
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
-INSTALLATION_DIR=$(datadir)
+INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(configuration) VERSION
 
 # bootstrap stepmake:
@@ -60,9 +60,9 @@ my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
 
 
 local-install:
-       $(INSTALL) -d $(datadir)
+       $(INSTALL) -d $(local_lilypond_datadir)
 ifeq ($(KPATHSEA),0)
-       $(foreach i, 1 2 3 4 5, rm -f $(datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(datadir)/tfm.$(i) ; )
+       $(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
 
 
@@ -105,42 +105,39 @@ WWW-clean:
        $(MAKE) -C input WWW-clean
 
 top-WWW-clean:
-       cd $(depth)/$(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png
+       cd $(builddir) && rm -f $(TOP_HTMLS) lily-[0-9]*.png
        $(SHELL) $(buildscript-dir)/clean-fonts.sh
 
 WWW:
 
 default: builddir-setup
 
-builddir-setup: $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force
+builddir-setup: $(builddir)/share/lilypond-force
 
-$(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)-force:
+$(builddir)/share/lilypond-force:
        # Preparing LilyPond tree for builddir exec
-       @echo Making $(depth)/$(builddir)/share 
-       @cd $(depth)/$(builddir) && rm -rf share
-       @cd $(depth)/$(builddir) && mkdir -p share/lilypond
-       @cd $(depth)/$(builddir)/share/lilypond && mkdir -p $(TOPLEVEL_VERSION)
-       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
-               ln -s ../../../$(srcdir)/ly ly && \
-               ln -s ../../../mf/$(outconfbase) dvips && \
+       @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 && \
+               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 $(abs-srcdir)/scm
+       @cd $(builddir)/share/lilypond/tex && \
+               ln -s $(abs-srcdir)/tex source && \
+               ln -s ../../../mf/$(outconfbase) generate
+       @cd $(builddir)/share/lilypond/fonts && \
+               ln -s $(abs-srcdir)/mf source && \
                ln -s ../../../mf/$(outconfbase) afm && \
                ln -s ../../../mf/$(outconfbase) tfm && \
-               ln -s ../../../$(srcdir)/mf && \
-               ln -s ../../../$(srcdir)/ps && \
-               ln -s ../../../$(srcdir)/scm
-       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
-               mkdir tex
-       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/tex && \
-               ln -s ../../../../$(srcdir)/tex source && \
-               ln -s ../../../../mf/$(outconfbase) generate
-       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION) && \
-               mkdir fonts
-       @cd $(depth)/$(builddir)/share/lilypond/$(TOPLEVEL_VERSION)/fonts && \
-               ln -s ../../../../$(srcdir)/mf source && \
-               ln -s ../../../../mf/$(outconfbase) afm && \
-               ln -s ../../../../mf/$(outconfbase) tfm && \
-               ln -s ../../../../mf/$(outconfbase) type1
+               ln -s ../../../mf/$(outconfbase) type1
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
-       @cd $(depth)/$(builddir) && rm -rf share
+       @cd $(builddir) && rm -rf share