diff options
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/build.sh')
-rwxr-xr-x | Build/source/texk/gregorio/gregorio-src/build.sh | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/build.sh b/Build/source/texk/gregorio/gregorio-src/build.sh index 896bcffbec1..da98af69de2 100755 --- a/Build/source/texk/gregorio/gregorio-src/build.sh +++ b/Build/source/texk/gregorio/gregorio-src/build.sh @@ -11,7 +11,7 @@ # --build= : build system for mingw32 cross-compilation # --arch= : crosscompile for ARCH on OS X # --jobs= : the number of jobs to run simultaneously in the make step -# --force= : force autoreconf or font building +# --force= : force autoreconf # {other) : anything else is passed to configure verbatim # try to find bash, in case the standard shell is not capable of @@ -45,7 +45,6 @@ MACCROSS=FALSE MAKEOPTS= OTHERARGS= FORCE_AUTORECONF= -FORCE_FONTS= until [ -z "$1" ]; do case "$1" in @@ -55,7 +54,6 @@ until [ -z "$1" ]; do --arch=* ) MACCROSS=TRUE; ARCH=`echo $1 | sed 's/--arch=\(.*\)/\1/' ` ;; -j*|--jobs=*) MAKEOPTS="$MAKEOPTS $1" ;; --force=autoreconf) FORCE_AUTORECONF=TRUE ;; - --force=fonts) FORCE_FONTS=TRUE ;; * ) OTHERARGS="$OTHERARGS $1" ;; esac shift @@ -71,14 +69,10 @@ then MINGWSTR=mingw32 if [ -d /usr/mingw32 ]; then MINGWSTR=mingw32 - else - if [ -d /usr/i386-mingw32msvc ]; then + elif [ -d /usr/i386-mingw32msvc ]; then MINGWSTR=i386-mingw32msvc - else - if [ -d /usr/i586-mingw32msvc ]; then + elif [ -d /usr/i586-mingw32msvc ]; then MINGWSTR=i586-mingw32msvc - fi - fi fi OLDPATH=$PATH PATH=/usr/$MINGWSTR/bin:$PATH @@ -89,8 +83,7 @@ then --host=$MINGWSTR \ --build=$MINGWBUILD \ --prefix=/usr/$MINGWSTR" -else -if [ "$MACCROSS" = "TRUE" ] +elif [ "$MACCROSS" = "TRUE" ] then # make sure that architecture parameter is valid case $ARCH in @@ -100,7 +93,6 @@ then ARCHFLAGS="$ARCHFLAGS" CFLAGS="-arch $ARCH -g -O2 $CFLAGS" LDFLAGS="-arch $ARCH $LDFLAGS" -fi fi @@ -124,18 +116,9 @@ echo "Configuring build files; options: $CONFIGURE_ARGS" echo echo "Building Gregorio; options:$MAKEOPTS" -${MAKE} ${MAKEOPTS} || die "build Gregorio" +${MAKE} ${MAKEOPTS} all doc || die "build Gregorio" echo -if [ "$FORCE_FONTS" = "TRUE" -o ! -e fonts/greciliae.ttf ] -then - echo "Building fonts; options:$MAKEOPTS" - cd fonts - ${MAKE} ${MAKEOPTS} fonts || die "build fonts" - cd .. - echo -fi - if [ "$MINGWCROSS" = "TRUE" ] then PATH=$OLDPATH |