* SConstruct (symlink):

* GNUmakefile.in (link-tree): Add scripts to prefix.

* lily/general-scheme.cc (ly:effective-prefix): New function.

* scm/backend-library.scm (postscript->png): Use it.

diff --git a/ChangeLog b/ChangeLog
index e2889aa3b62b96ed0936661b730b3fb5e6b4aed3..7aceb0fd27b6f012bcfe48eb0de4a5c382fa3759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * SConstruct (symlink): 
+       * GNUmakefile.in (link-tree): Add scripts to prefix.
+
+       * lily/general-scheme.cc (ly:effective-prefix): New function.
+
+       * scm/backend-library.scm (postscript->png): Use it.
+
 2005-03-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/part-combiner.scm (determine-split-list): switch off

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d28279a5f67ceb4b7686ce31aab38d99fd820495..57ad0d9528a663be4c55260830ff52b2e5cc4bb2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -117,7 +117,8 @@ $(tree-prefix)/lilypond-force: GNUmakefile
                ln -s $(abs-srcdir)/mf && \
                ln -s $(abs-srcdir)/ps && \
                ln -s ../../../python/$(outconfbase) python && \
-               ln -s $(abs-srcdir)/scm
+               ln -s $(abs-srcdir)/scm && \
+               ln -s $(abs-srcdir)/scripts scripts
        cd $(tree-prefix)/dvips && \
                ln -s ./../../mf/$(outconfbase) mf-out && \
                ln -s $(abs-srcdir)/ps

diff --git a/SConstruct b/SConstruct
index 48250ccb16cc87a3ad69957f0d5124118703ed7a..29a72d08a72f9f192f27f46009e088fb11e5a255 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -704,6 +704,7 @@ def symlink_tree (target, source, env):
              ('mf',         'share/lilypond/%(ver)s/tex/mf-out'),
              ('#ly',        'share/lilypond/%(ver)s/ly'),
              ('#scm',       'share/lilypond/%(ver)s/scm'),
+             ('#scripts',   'share/lilypond/%(ver)s/scripts'),
              ('#ps',        'share/lilypond/%(ver)s/ps'),
              ('po/@/nl.mo', 'share/locale/nl/LC_MESSAGES/lilypond.mo'),
              ('elisp',      'share/lilypond/%(ver)s/elisp')))

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 3d89ea5b53cd02cfd607b8d13355f865a018f333..28b851af41052381b9b2d4038c3da5588bbcd7fa 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -228,3 +228,10 @@ LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8",
   return scm_makfrom0str (buf);
 }
          
+LY_DEFINE (ly_effective_prefix, "ly:effective-prefix",
+          0, 0, 0, (),
+          "Return effective prefix.")
+{
+  return scm_makfrom0str (prefix_directory.to_str0 ());
+}
+

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index ca2b984d88e905218ce9be412b1cddbdf479428a..5920c9977698adc5276f3498e4829572b54fb92d 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -45,7 +45,8 @@
     (ly:system cmd)))
 
 (define-public (postscript->png resolution papersizename name)
-  (let* ((prefix (getenv "LILYPONDPREFIX"))
+  (let* ((prefix (ly:effective-prefix))
+        ;; FIXME: should scripts/ps2png.py be installed in PREFIX?
         (ps2png-source (if prefix
                           (format "~a/scripts/ps2png.py" prefix)
                           "ps2png"))