diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2002-12-28 11:57:33 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2002-12-28 11:57:33 +0000 |
| commit | e1d47884955f31275ebb0972a08efd1d9d0457dc (patch) | |
| tree | eecaaa544138c05d3230306340b04a6eea2b502a /aclocal.m4 | |
| parent | 8477077d655054641846772ee0eda4335711d394 (diff) | |
* .cvsignore: Remove stepmake (huh!?!), add lib.
* GNUmakefile.in: Add libdir links for builddir runs.
* scripts/midi2ly.py: Add [lilypond_]libdir/python to path,
instead of datadir.
* make/substitute.make (ATVARIABLES): Add lilypond_libdir,
local_lilypond_libdir.
* config.make.in (lilypond_libdir): Add.
* stepmake/stepmake/substitute-rules.make:
* stepmake/stepmake/script-rules.make:
* stepmake/stepmake/python-module-rules.make:
* stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fixes from
lilypond-python-module patch.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 5dbbe94ae1..eb03abd45b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ dnl aclocal.m4 -*-shell-script-*- dnl WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from /home/rz/lilypond/lilypond/stepmake/aclocal.m4 +dnl do not edit! this is aclocal.m4, generated from /home/fred/lily/stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -264,16 +264,15 @@ AC_DEFUN(STEPMAKE_DATADIR, [ ## ugh: cut & paste programming from datadir. AC_DEFUN(STEPMAKE_LIBDIR, [ - if test "$datadir" = "\${prefix}/lib"; then - datadir='${prefix}/lib' + if test "$libdir" = "\${exec_prefix}/lib"; then + libdir='${exec_prefix}/lib' fi - presome=${prefix} - if test "$prefix" = "NONE"; then + presome=${exec_prefix} + if test "$exec_prefix" = "NONE"; then presome=${ac_default_prefix} fi package_libdir=$libdir/$package - local_package_libdir=$package_libdir/$FULL_VERSION build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package |