X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cygwin%2FGNUmakefile;h=7e25a64c5483a15a3681d5d54ae62d3a91e88009;hb=101b5dbd7018e185fb64c8dbd7589aec99395605;hp=eaef83507837bf31b66004e22e01038071dbbf7b;hpb=98d27adc0c36ca2ca6d8e5b6650d64e5990c05bf;p=lilypond.git diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile index eaef835078..7e25a64c54 100644 --- a/cygwin/GNUmakefile +++ b/cygwin/GNUmakefile @@ -2,8 +2,8 @@ depth = .. NAME = cygwin -MKNETRELS = $(wildcard mknetrel mknetrel.*[a-z]) -EXTRA_DIST_FILES = changelog $(MKNETRELS) $(wildcard *.hint) +MKNETRELS = mknetrel $(call src-wildcard,mknetrel.*[a-z]) +EXTRA_DIST_FILES = changelog $(MKNETRELS) $(call src-wildcard,*.hint) SEXECUTABLES=bug-lilypond-cygwin lily-wins STEPMAKE_TEMPLATES = install install-out script @@ -15,42 +15,19 @@ ifneq ($(CYGWIN_BUILD),) include $(stepdir)/executable-targets.make -POSTINSTALLS=$(wildcard postinstall*.sh) +POSTINSTALLS=$(call src-wildcard,postinstall*.sh) OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%) -POSTREMOVES=$(wildcard postremove*.sh) -OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%) - -PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh -OUT_PROFILES=$(PROFILES:%=$(outdir)/%) - -# profiles $(outdir)/%.sh: %.sh $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -# Get profile from buildscripts -$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile - cp $< $@ - chmod 755 $@ - -default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUT_PROFILES) $(OUTIN_FILES) - -INSTALLATION_OUT_SUFFIXES=1 2 # 3 +default: $(OUT_POSTINSTALLS) $(OUTIN_FILES) # Avoid collapsed directory constructs '//' -etc=$(patsubst %/, %, $(dir $(prefix)))/etc -INSTALLATION_DIR=$(etc)/postinstall -INSTALLATION_FILES=$(OUT_POSTINSTALLS) - -INSTALLATION_OUT_DIR1=$(etc)/profile.d -INSTALLATION_OUT_FILES1=$(OUT_PROFILES) - -INSTALLATION_OUT_DIR2=$(etc)/postremove -INSTALLATION_OUT_FILES2=$(OUT_POSTREMOVES) - -# INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/tex -# INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty) +etc=$(patsubst %/,%, $(dir $(prefix)))/etc +INSTALLATION_OUT_DIR=$(etc)/postinstall +INSTALLATION_OUT_FILES=$(OUT_POSTINSTALLS) endif