Mercurial > gub
changeset 485:decd9377609b
add path and pango_prefix to lilypond wrapper.
| author | janneke <janneke@gnu.org> |
|---|---|
| date | Wed, 28 Dec 2005 18:14:24 +0100 |
| parents | 86fcf9f437c3 |
| children | 37042ef0794a |
| files | specs/framework.py specs/gub.py |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/specs/framework.py Wed Dec 28 16:35:56 2005 +0100 +++ b/specs/framework.py Wed Dec 28 18:14:24 2005 +0100 @@ -389,6 +389,8 @@ def install (self): LilyPond.install (self) + # wrap lilypond binary for libraries in framework dir + # handle framework dir in relocate.cc? self.system (''' cd %(install_root)s/usr/bin && mv lilypond lilypond-bin ''') @@ -410,8 +412,11 @@ GS_FONTPATH=$FRAMEWORK_DIR/usr/share/gs/8.15/fonts:$GS_FONTPATH \\ GS_LIB=$FRAMEWORK_DIR/usr/share/gs/8.15/lib:$GS_LIB \\ LD_LIBRARY_PATH=$FRAMEWORK_DIR/usr/lib:$LD_LIBRARY_PATH \\ +PANGO_PREFIX=${PANGO_PREFIX-$FRAMEWORK_DIR/usr} \\ PANGO_RC_FILE=${PANGO_RC_FILE-$FRAMEWORK_DIR/usr/etc/pango/pangorc} \\ -PYTHONPATH=$FRAMEWORK_DIR/usr/../python:$PYTHONPATH \\ +PANGO_SO_EXTENSION=.so \\ +PATH=$FRAMEWORK_DIR/usr/bin:$PATH \\ +PYTHONPATH=$FRAMEWORK_DIR/../python:$PYTHONPATH \\ PYTHONPATH=$FRAMEWORK_DIR/usr/lib/python%(python_version)s:$PYTHONPATH \\ $prefix/bin/lilypond-bin "$@" '''
--- a/specs/gub.py Wed Dec 28 16:35:56 2005 +0100 +++ b/specs/gub.py Wed Dec 28 18:14:24 2005 +0100 @@ -240,9 +240,14 @@ # FIXME: avoid using libs from /usr/lib when # building linux package. - # * Only do this after installing in system root? - # * configure using --libdir=%(system_root)s/usr/lib ? + # Actually, this check should be something like + # if build_arch == target_arch: + # rather than if linux: + # Move this to xpm.py, and only do this after + # installing? But how does xpm know whether + # we do a native install, as system install + # or an installer install. if self.settings.platform.startswith ('linux'): self.file_sub ([ ('^libdir=.*',