From 7e9683689ef1037bcb261d2804242aecaaf632a7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 24 Jul 2002 13:35:05 +0000 Subject: [PATCH] * make/lilypond-vars.make: * scripts/ly2dvi.py: * scripts/lilypond-book.py: * scripts/mup2ly.py: * scripts/midi2ly.py: use local_package_datadir iso datadir. * GNUmakefile.in: build_datadir without version. --- ChangeLog | 2 ++ buildscripts/GNUmakefile | 2 +- buildscripts/lilypond-login.sh | 4 ++-- buildscripts/lilypond-profile.sh | 2 +- scripts/lilypond-book.py | 4 ++-- scripts/ly2dvi.py | 4 ++-- scripts/midi2ly.py | 4 ++-- scripts/mup2ly.py | 12 ++++++------ 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bafb7d99e..a7662a6172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-07-24 Jan Nieuwenhuizen + * make/substitute.make (ATVARIABLES): Add local_lilypond_datadir. + * aclocal.m4: Regenerate. * config.hh.in: diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile index 08b617bd20..aff844b167 100644 --- a/buildscripts/GNUmakefile +++ b/buildscripts/GNUmakefile @@ -7,7 +7,7 @@ include $(depth)/make/stepmake.make # Should we install these? This should be handled by sysadmin or # packager but if she forgets... #INSTALLATION_OUT_SUFFIXES=1 -#INSTALLATION_OUT_DIR1=$(datadir)/scripts +#INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/scripts #INSTALLATION_OUT_FILES1=$(outdir)/lilypond-login $(outdir)/lilypond-profile all: $(INSTALLATION_FILES) diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index 8b472b3784..21333f50ba 100644 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -10,7 +10,7 @@ # strange shell, this C -set datadir="@datadir@" +set datadir="@local_lilypond_datadir@" if ( $?GS_LIB ) then setenv GS_LIB "$datadir/ps:$GS_LIB" @@ -22,7 +22,7 @@ set datadir="@datadir@" # setenv LILYPONDPREFIX "$datadir" # bit silly. for ly2dvi, overrules compiled-in datadir... -# setenv LILYPONDPREFIX "@datadir@" +# setenv LILYPONDPREFIX "@local_lilypond_datadir@" # Add the installation directory to the teTeX system tree, # see Documentation/misc/fontinstallation diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh index 60502ebf53..f78003f8be 100644 --- a/buildscripts/lilypond-profile.sh +++ b/buildscripts/lilypond-profile.sh @@ -9,7 +9,7 @@ if [ -z "$LILYPONDPREFIX" ]; then - datadir=`echo "@datadir@" | sed 's!//!/!g'` + datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'` else if [ -d "$LILYPONDPREFIX/fonts" ]; then datadir=$LILYPONDPREFIX diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 2604ba32fe..e691aeb66b 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -92,12 +92,12 @@ if program_version == '@' + 'TOPLEVEL_VERSION' + '@': # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX -datadir = '@local_package_datadir@' +datadir = '@local_lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX') : datadir = os.environ['LILYPONDPREFIX'] else: - datadir = '@local_package_datadir@' + datadir = '@local_lilypond_datadir@' while datadir[-1] == os.sep: datadir= datadir[:-1] diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index cbf2c31831..764f12cc76 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -296,12 +296,12 @@ def mkdir_p (dir, mode=0777): # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX -datadir = '@local_package_datadir@' +datadir = '@local_lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX') : datadir = os.environ['LILYPONDPREFIX'] else: - datadir = '@local_package_datadir@' + datadir = '@local_lilypond_datadir@' while datadir[-1] == os.sep: diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index ff3df9cace..7fe8b24b04 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -30,11 +30,11 @@ import string # do fuddling: we must load the midi module from the right directory. -datadir = '@local_package_datadir@' +datadir = '@local_lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX'): datadir = os.environ['LILYPONDPREFIX'] else: - datadir = '@local_package_datadir@' + datadir = '@local_lilypond_datadir@' sys.path.append (os.path.join (datadir, 'python')) sys.path.append (os.path.join (datadir, 'python/out')) diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index 6db68dd8ff..da3a43be25 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -37,17 +37,17 @@ import tempfile # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX -datadir = '@local_package_datadir@' +datadir = '@local_lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX') \ - or '@local_package_datadir@' == '@' + 'local_package_datadir' + '@': + or '@local_lilypond_datadir@' == '@' + 'local_lilypond_datadir' + '@': datadir = os.environ['LILYPONDPREFIX'] else: - datadir = '@local_package_datadir@' + datadir = '@local_lilypond_datadir@' sys.path.append (os.path.join (datadir, 'python')) sys.path.append (os.path.join (datadir, 'python/out')) -program_name = 'ly2dvi' +program_name = 'mup2ly' program_version = '@TOPLEVEL_VERSION@' original_dir = os.getcwd () temp_dir = os.path.join (original_dir, '%s.dir' % program_name) @@ -313,12 +313,12 @@ def mkdir_p (dir, mode=0777): # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX -datadir = '@datadir@' +datadir = '@local_lilypond_datadir@' if os.environ.has_key ('LILYPONDPREFIX') : datadir = os.environ['LILYPONDPREFIX'] else: - datadir = '@datadir@' + datadir = '@local_lilypond_datadir@' while datadir[-1] == os.sep: -- 2.39.2