diff options
| author | Federico Bruni <fedelogy@gmail.com> | 2015-07-11 15:07:51 +0200 |
|---|---|---|
| committer | Federico Bruni <fedelogy@gmail.com> | 2015-07-18 17:39:16 +0200 |
| commit | 2f771b342689e45c55e083da1f835a51a02493b3 (patch) | |
| tree | 489fb6115318d501f141fabcc25dfebbf6ea7678 | |
| parent | 8f97d7aa2db75a91cd02592eebf9af982cd14f01 (diff) | |
issue 4491: replace BUILD_DIR with LILYPOND_BUILD_DIR
| -rw-r--r-- | Documentation/contributor/programming-work.itexi | 2 | ||||
| -rwxr-xr-x | scripts/auxiliar/update-with-convert-ly.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi index f14057e60c..99dc79da4a 100644 --- a/Documentation/contributor/programming-work.itexi +++ b/Documentation/contributor/programming-work.itexi @@ -1375,7 +1375,7 @@ scripts/auxiliar/update-with-convert-ly.sh If you did an out-of-tree build, pass in the relative path: @example -BUILD_DIR=../build-lilypond/ scripts/auxiliar/update-with-convert-ly.sh +LILYPOND_BUILD_DIR=../build-lilypond/ scripts/auxiliar/update-with-convert-ly.sh @end example diff --git a/scripts/auxiliar/update-with-convert-ly.sh b/scripts/auxiliar/update-with-convert-ly.sh index 978fab4f55..6092d83350 100755 --- a/scripts/auxiliar/update-with-convert-ly.sh +++ b/scripts/auxiliar/update-with-convert-ly.sh @@ -8,22 +8,22 @@ fi ### get the directories TOP_SRC_DIR=`pwd` -if [ -z $BUILD_DIR ]; then - BUILD_DIR=. +if [ -z $LILYPOND_BUILD_DIR ]; then + LILYPOND_BUILD_DIR=. fi ### make sure convert-ly is up-to-date -cd $BUILD_DIR +cd $LILYPOND_BUILD_DIR make python-modules cd $TOP_SRC_DIR ### update manuals find Documentation/ -path 'Documentation/snippets' -prune -o -name out -prune \ -o -name 'out-*' -prune -o -name '*.itely' -print \ - | xargs $BUILD_DIR/out/bin/convert-ly -e -d "$@" + | xargs $LILYPOND_BUILD_DIR/out/bin/convert-ly -e -d "$@" ### update .ly files # don't look in . otherwise it'll find stuff in build/ ! find Documentation/ input/ ly/ -name out -prune -o -name 'out-*' -prune \ -o \( -name '*.ly' -o -name '*.ily' \) -print \ - | xargs $BUILD_DIR/out/bin/convert-ly -e -d "$@" + | xargs $LILYPOND_BUILD_DIR/out/bin/convert-ly -e -d "$@" |