* cygwin/GNUmakefile:

* ly/GNUmakefile:
* python/GNUmakefile:
* make/GNUmakefile:
* mf/GNUmakefile:
* scm/GNUmakefile:
* tex/GNUmakefile: use local_package_datadir iso datadir.

diff --git a/ChangeLog b/ChangeLog
index a7662a617277cc55bb61b8771a3396b801e2884b..615345923c09cf2b6f0cc37bf877c60d1055d832 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 7a24b325a45600a560c9cf32e4bbdc91e57d4399..86d20f4add92781cda3c2a96c1d7eb86d89c3260 100644 (file)
--- 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 60cc067dc307bb37a92f3c9692da8096eb1ed772..314310b3ec0e0e01a35527ada6190785cb4c05ac 100644 (file)
--- 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 2e9f025b295f6e229e335501be35b75a3de0ea60..93c085d46e13bd867d9329ac26f2b2d56111fed5 100644 (file)
--- 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 8f46922ded5b6b49925776f6a485d1ea0b9370f9..a659f398f87f2a6ffe75a33a84fdf22e6958a911 100644 (file)
--- 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 c5f0567b9aa337f05d10ca467d150db38287c94a..13e34c1fb5428ae25708ae6634c7848a1ed7846f 100644 (file)
--- 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 4803038f5979c4d015566adf4e428740f069db29..1ade515613c934f6fbce48df0b0867b2e3591a40 100644 (file)
--- 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 5cab304d0e4f78625693b06e5c10b0d7f66bfd77..21305446cf265b244c8ab500ea06820a11885c9f 100644 (file)
--- 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 c10270ce5764e5dce93d760bca7900bd49a66dda..68fe45d7fb7e06493ce822c48adca2a5a9075ae3 100644 (file)
--- 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 668391de006ab7ef0409028bdca0ab92e6205938..be4e43a8320531287ed6cb0c510328207efb3e35 100644 (file)
--- 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 f69214c2f5a032ec6ae134b7378b11054628b8d2..c9f4c4b19bde51bef61237946a64879403d07092 100644 (file)
--- 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