nu wel 58

[lilypond.git] / Documentation / windows / GNUmakefile

diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile
index b2afb6c5cddd035755aac4b392aa848c672e51e4..0416dff9a9b436cc9bf08180922f66989e1ffb6a 100644 (file)
--- a/Documentation/windows/GNUmakefile
+++ b/Documentation/windows/GNUmakefile
@@ -1,7 +1,7 @@
 
 depth=../..
 
-EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch)
+EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) setup.hint
 
 STEPMAKE_TEMPLATES=documentation texinfo install install-out
 
@@ -18,28 +18,9 @@ ifeq ($(target),i686-pc-cygwin)
 POST_INSTALLS=$(wildcard post-*.sh)
 OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
 
-# lily-*: rename to '-profile' or so
-PROFILES=$(wildcard *lily-*.sh) lilypond-profile.sh
+PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
 OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
 
-##as2text.scm
-PYTHON_WRAPPERS=\
- abc2ly\
- convert-ly\
- etf2ly\
- lilypond-book\
- ly2dvi\
- mup2ly\
- musedata2ly\
- pmx2ly\
- update-lily\
-#
-
-OUT_PYTHON_WRAPPERS=$(PYTHON_WRAPPERS:%=$(outdir)/%)
-
-TEX_WRAPPERS=dvips latex tex
-OUT_TEX_WRAPPERS=$(TEX_WRAPPERS:%=$(outdir)/%)
-
 # profiles
 $(outdir)/%.sh: %.sh
        cat $< | sed $(sed-atvariables) > $@
@@ -50,49 +31,25 @@ $(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/out/lilypond-p
        cp $< $@
        chmod 755 $@
 
-# python wrappers
-$(outdir)/%: python-wrapper.sh
-       cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
-       chmod 755 $@
+default: $(OUT_POST_INSTALLS) $(OUT_PROFILES)
 
-# tex wrappers
-#$(outdir)/%: %-wrapper.sh
-#      cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
-#      chmod 755 $@
-
-$(outdir)/tex: tex-wrapper.sh
-       cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@
-       chmod 755 $@
-
-$(outdir)/latex: latex-wrapper.sh
-       cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@
-       chmod 755 $@
-
-default: $(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) $(OUT_POST_INSTALLS) $(OUT_PROFILES)
-
-# urg: change suffixes before overwriting python scripts
-
-INSTALLATION_OUT_SUFFIXES=1 2 3 4
+INSTALLATION_OUT_SUFFIXES=1 2
 
 # URG.
 # By popular demand,
 # LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
 # The cygwin profile.d dir, however, is in /etc
 
-INSTALLATION_DIR=$(shell dirname $(shell dirname $(prefix)))/etc/postinstall
+# avoid collapsed directory constructs '//'
+etc=$(dir $(patsubst %/, %, $(dir $(prefix))))etc
+INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POST_INSTALLS)
 
-INSTALLATION_OUT_DIR1=$(shell dirname $(shell dirname $(prefix)))/etc/profile.d
+INSTALLATION_OUT_DIR1=$(etc)/profile.d
 INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
 
-INSTALLATION_OUT_DIR2=$(prefix)/wrappers
-INSTALLATION_OUT_FILES2=$(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS)
-
-INSTALLATION_OUT_DIR3=$(datadir)/tex
-INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty)
-
-INSTALLATION_OUT_DIR4=$(datadir)/tfm
-INSTALLATION_OUT_FILES4=$(shell kpsewhich cmr10.tfm)
+INSTALLATION_OUT_DIR2=$(datadir)/tex
+INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty)
 
 else