From 2c3df4721f91845e7a49c270ff06809275be49ae Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 24 Jul 2002 13:45:40 +0000 Subject: [PATCH] * cygwin/GNUmakefile: * ly/GNUmakefile: * python/GNUmakefile: * make/GNUmakefile: * mf/GNUmakefile: * scm/GNUmakefile: * tex/GNUmakefile: use local_package_datadir iso datadir. --- ChangeLog | 8 ++++++++ GNUmakefile.in | 6 +++--- cygwin/GNUmakefile | 2 +- ly/GNUmakefile | 4 +--- make/GNUmakefile | 5 ++--- mf/GNUmakefile | 12 ++++++------ ps/GNUmakefile | 6 ++---- python/GNUmakefile | 2 +- scm/GNUmakefile | 2 +- stepmake/GNUmakefile.in | 2 +- tex/GNUmakefile | 7 ++----- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7662a6172..615345923c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2002-07-24 Jan Nieuwenhuizen + * cygwin/GNUmakefile: + * ly/GNUmakefile: + * python/GNUmakefile: + * make/GNUmakefile: + * mf/GNUmakefile: + * scm/GNUmakefile: + * tex/GNUmakefile: use local_package_datadir iso datadir. + * make/substitute.make (ATVARIABLES): Add local_lilypond_datadir. * aclocal.m4: Regenerate. diff --git a/GNUmakefile.in b/GNUmakefile.in index 7a24b325a4..86d20f4add 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -21,7 +21,7 @@ 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 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 diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile index 60cc067dc3..314310b3ec 100644 --- a/cygwin/GNUmakefile +++ b/cygwin/GNUmakefile @@ -46,7 +46,7 @@ INSTALLATION_FILES=$(OUT_POST_INSTALLS) INSTALLATION_OUT_DIR1=$(etc)/profile.d INSTALLATION_OUT_FILES1=$(OUT_PROFILES) -INSTALLATION_OUT_DIR2=$(datadir)/tex +INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty) else diff --git a/ly/GNUmakefile b/ly/GNUmakefile index 2e9f025b29..93c085d46e 100644 --- a/ly/GNUmakefile +++ b/ly/GNUmakefile @@ -1,11 +1,9 @@ -# init/Makefile - depth = .. INI_FILES = $(FLY_FILES) $(SLY_FILES) $(LY_FILES) EXTRA_DIST_FILES = $(SCM_FILES) -INSTALLATION_DIR=$(datadir)/ly/ +INSTALLATION_DIR=$(local_lilypond_datadir)/ly/ INSTALLATION_FILES=$(INI_FILES) STEPMAKE_TEMPLATES=install diff --git a/make/GNUmakefile b/make/GNUmakefile index 8f46922ded..a659f398f8 100644 --- a/make/GNUmakefile +++ b/make/GNUmakefile @@ -1,8 +1,7 @@ -# file make/Makefile - depth = .. + STEPMAKE_TEMPLATES=makedir install -INSTALLATION_DIR=$(datadir)/make +INSTALLATION_DIR=$(local_lilypond_datadir)/make INSTALLATION_FILES=$(DIST_FILES) include $(depth)/make/stepmake.make diff --git a/mf/GNUmakefile b/mf/GNUmakefile index c5f0567b9a..13e34c1fb5 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -38,18 +38,18 @@ TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm)) ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" -INSTALLATION_DIR=$(datadir)/fonts/source +INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source INSTALLATION_FILES=$(MF_FILES) $(AF_FILES) INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 -INSTALLATION_OUT_DIR1=$(datadir)/tex +INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) -INSTALLATION_OUT_DIR2=$(datadir)/fonts/afm +INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/afm INSTALLATION_OUT_FILES2=$(AFM_FILES) -INSTALLATION_OUT_DIR3=$(datadir)/fonts/tfm +INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) # comment this out if you don't want pfa's to be generated @@ -60,10 +60,10 @@ PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) $(outdir)/cmbxti8.pf ifdef MAKE_PFA_FILES ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale -INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1 +INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/type1 INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale -INSTALLATION_OUT_DIR5=$(datadir)/dvips/ +INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/dvips/ INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map endif diff --git a/ps/GNUmakefile b/ps/GNUmakefile index 4803038f59..1ade515613 100644 --- a/ps/GNUmakefile +++ b/ps/GNUmakefile @@ -1,13 +1,11 @@ -# ps/Makefile - depth = .. PS_FILES = $(wildcard *.ps) STEPMAKE_TEMPLATES=install -EXTRA_DIST_FILES = $(PS_FILES) +EXTRA_DIST_FILES = $(PS_FILES) -INSTALLATION_DIR=$(datadir)/ps/ +INSTALLATION_DIR=$(local_lilypond_datadir)/ps/ INSTALLATION_FILES=$(PS_FILES) include $(depth)/make/stepmake.make diff --git a/python/GNUmakefile b/python/GNUmakefile index 5cab304d0e..21305446cf 100644 --- a/python/GNUmakefile +++ b/python/GNUmakefile @@ -1,7 +1,7 @@ depth = .. INSTALLATION_FILES=$(PY_MODULES) $(OUT_PY_MODULES) $(OUT_SO_MODULES) -INSTALLATION_DIR=$(datadir)/python +INSTALLATION_DIR=$(local_lilypond_datadir)/python STEPMAKE_TEMPLATES=c python-module install po diff --git a/scm/GNUmakefile b/scm/GNUmakefile index c10270ce57..68fe45d7fb 100644 --- a/scm/GNUmakefile +++ b/scm/GNUmakefile @@ -2,7 +2,7 @@ depth = .. -INSTALLATION_DIR=$(datadir)/scm/ +INSTALLATION_DIR=$(local_lilypond_datadir)/scm/ INSTALLATION_FILES=$(SCM_FILES) STEPMAKE_TEMPLATES=install scm diff --git a/stepmake/GNUmakefile.in b/stepmake/GNUmakefile.in index 668391de00..be4e43a832 100644 --- a/stepmake/GNUmakefile.in +++ b/stepmake/GNUmakefile.in @@ -50,7 +50,7 @@ stepmake/aclocal.m4: -$(LN) aclocal.m4 $@ ifeq ($(PACKAGE),STEPMAKE) -INSTALLATION_DIR=$(datadir) +INSTALLATION_DIR=$(package_datadir) INSTALLATION_FILES=$(DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) GNUmakefile config.make config.status include $(stepdir)/install-targets.make endif diff --git a/tex/GNUmakefile b/tex/GNUmakefile index f69214c2f5..c9f4c4b19b 100644 --- a/tex/GNUmakefile +++ b/tex/GNUmakefile @@ -1,14 +1,11 @@ -# tex/Makefile - depth = .. - TEX_FILES = $(wildcard *.tex) -EXTRA_DIST_FILES = $(TEX_FILES) +EXTRA_DIST_FILES = $(TEX_FILES) STEPMAKE_TEMPLATES=install -INSTALLATION_DIR=$(datadir)/tex/ +INSTALLATION_DIR=$(local_lilypond_datadir)/tex/ INSTALLATION_FILES=$(TEX_FILES) include $(depth)/make/stepmake.make -- 2.39.2