Commit cb4ca8c7 authored by Jonas Hahnfeld's avatar Jonas Hahnfeld
Browse files

Drop all variants of libdir and lib-prefix

The only place that still used this was relocate-preamble.py.in which
is pointless if there are no .py files installed.
parent f749faff
......@@ -185,14 +185,12 @@ all-doc:
tree-prefix = $(outdir)
tree-bin = $(tree-prefix)/bin
tree-lib = $(tree-prefix)/lib
tree-share = $(tree-prefix)/share
# Don't put version numbers here. During development
# they make no sense, and cause EPS files to become invalid.
tree-share-prefix = $(tree-share)/lilypond/current
tree-lib-prefix = $(tree-lib)/lilypond/current
src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
......@@ -207,10 +205,9 @@ link-tree: $(tree-share-prefix)/lilypond-force
$(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION
$(call ly_progress,Making,$@,)
cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
cd $(top-build-dir)/$(outbase) && rm -rf bin share
mkdir -p $(tree-bin)
mkdir -p $(tree-share-prefix)
mkdir -p $(tree-lib-prefix)
mkdir -p $(tree-share-prefix)/elisp
mkdir -p $(tree-share-prefix)/fonts
mkdir -p $(tree-share-prefix)/fonts/otf
......@@ -221,8 +218,6 @@ $(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION
ln -sf ../../lily/$(outconfbase)/lilypond . && \
for i in abc2ly convert-ly etf2ly lilymidi lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \
do ln -sf ../../scripts/$(outconfbase)/$$i . ; done
cd $(tree-lib-prefix) && \
ln -s ../../../../python/$(outconfbase) python
cd $(tree-share-prefix) && \
ln -s $(top-src-dir)/ly ly && \
ln -s ../../../../mf mf && \
......
......@@ -301,28 +301,6 @@ AC_DEFUN(STEPMAKE_DATADIR, [
])
## ugh: cut & paste programming from datadir.
AC_DEFUN(STEPMAKE_LIBDIR, [
presome=${exec_prefix}
if test "$presome" = "NONE"; then
presome=${prefix}
fi
if test "$presome" = "NONE"; then
presome=${ac_default_prefix}
fi
build_package_libdir=$ac_pwd/out/lib/$package
LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"`
AC_SUBST(libdir)
AC_SUBST(build_package_libdir)
AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
])
AC_DEFUN(STEPMAKE_PREFIX_EXPAND_FIXUP, [
# undo expanding of explicit --infodir=/usr/share
# to ease install-time override with prefix=...
......@@ -330,10 +308,6 @@ AC_DEFUN(STEPMAKE_PREFIX_EXPAND_FIXUP, [
if test "$includedir" = "`eval echo $prefix$strip`"; then
includedir='${prefix}'$strip''
fi
strip=`echo $libdir | eval sed s@^$exec_prefix@@`
if test "$libdir" = "`eval echo $exec_prefix$strip`"; then
libdir='${exec_prefix}'$strip''
fi
strip=`echo $infodir | eval sed s@^$datarootdir@@`
if test "$infodir" = "`eval echo $datarootdir$strip`"; then
infodir='${datarootdir}'$strip''
......@@ -739,7 +713,6 @@ AC_DEFUN(STEPMAKE_INIT, [
AC_SUBST(ROOTSEP)
STEPMAKE_DATADIR
STEPMAKE_LIBDIR
])
......
......@@ -74,7 +74,6 @@ YACC = @YACC@
ZIP = @ZIP@
bindir = @bindir@
build_lilypond_datadir = @build_package_datadir@
build_lilypond_libdir = @build_package_libdir@
configure-builddir = @abs_builddir@
configure-srcdir = @abs_srcdir@
datadir = @datadir@
......@@ -84,23 +83,18 @@ elispdir = $(datadir)/emacs/site-lisp
exec_prefix = @exec_prefix@
includedir = @includedir@
infodir = @infodir@
libdir = @libdir@
lilypond_datadir = $(local_package_datadir)
lilypond_docdir = $(package_docdir)
lilypond_libdir = $(local_package_libdir)
local_lilypond_datadir = $(local_package_datadir)
local_lilypond_docdir = $(local_package_docdir)
local_lilypond_libdir = $(local_package_libdir)
local_package_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
local_package_docdir = $(package_docdir)/$(TOPLEVEL_VERSION)
local_package_libdir = $(package_libdir)/$(TOPLEVEL_VERSION)
localedir = @localedir@
mandir = @mandir@
package = lilypond
package_datadir = $(datadir)/$(package)
package_docdir = $(docdir)/$(package)
package_infodir = $(infodir)/$(package)
package_libdir = $(libdir)/$(package)
prefix = @prefix@
program_prefix = @program_prefix@
program_suffix = @program_suffix@
......
......@@ -24,9 +24,7 @@ ATVARIABLES = \
date\
lilypond_datadir\
lilypond_docdir\
lilypond_libdir\
local_lilypond_datadir\
local_lilypond_libdir\
localedir\
outdir\
prefix\
......
......@@ -27,15 +27,12 @@ might modify installed .pyc files.
"""
for d in ['@lilypond_datadir@',
'@lilypond_libdir@']:
sys.path.insert (0, os.path.join (d, 'python'))
sys.path.insert (0, os.path.join ('@lilypond_datadir@', 'python'))
# dynamic relocation, for GUB binaries.
bindir = os.path.abspath (os.path.dirname (sys.argv[0]))
for p in ['share', 'lib']:
datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p)
sys.path.insert (0, datadir)
datadir = os.path.abspath (bindir + '/../share/lilypond/current/python/')
sys.path.insert (0, datadir)
# Python scripts executed during 'make test' and 'make test-baseline'
# must use their own versions of the scripts and the files loaded by
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment