diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-23 22:38:00 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-01-23 22:38:00 +0000 |
commit | faa5f31c4901212372d2dcf7080d9f0a23d5f195 (patch) | |
tree | cda02ce149a95cfa5d20f01943eceae7ff256b7b /Build/source/texk/gregorio/gregorio-src/build.sh | |
parent | 21d19604dc80efef1747f4a048c9dae5e8e810b1 (diff) |
gregorio 4.1.0-beta1
git-svn-id: svn://tug.org/texlive/trunk@39470 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/build.sh')
-rwxr-xr-x | Build/source/texk/gregorio/gregorio-src/build.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/build.sh b/Build/source/texk/gregorio/gregorio-src/build.sh index 9625bc85ec3..896bcffbec1 100755 --- a/Build/source/texk/gregorio/gregorio-src/build.sh +++ b/Build/source/texk/gregorio/gregorio-src/build.sh @@ -22,6 +22,21 @@ then export CONFIG_SHELL fi +# try to find gnu make; we may need it +MAKE=make +if make -v 2>&1| grep "GNU Make" >/dev/null +then + echo "Your make is a GNU-make; I will use that" +elif gmake -v >/dev/null 2>&1 +then + MAKE=gmake + export MAKE + echo "You have a GNU-make installed as gmake; I will use that" +else + echo "I can't find a GNU-make; I'll try to use make and hope that works." + echo "If it doesn't, please install GNU-make." +fi + WARNINGS=yes MINGWCROSS=FALSE CONFHOST= @@ -32,12 +47,9 @@ OTHERARGS= FORCE_AUTORECONF= FORCE_FONTS= -CFLAGS="$CFLAGS -Wdeclaration-after-statement" - until [ -z "$1" ]; do case "$1" in --mingw ) MINGWCROSS=TRUE ;; - --warn ) WARN=TRUE ;; --host=* ) CONFHOST="$1" ;; --build=* ) CONFBUILD="$1" ;; --arch=* ) MACCROSS=TRUE; ARCH=`echo $1 | sed 's/--arch=\(.*\)/\1/' ` ;; @@ -53,14 +65,6 @@ B=build ARCHFLAGS= -if [ "$WARN" = "TRUE" ] -then - CFLAGS="-Wall -Wextra \ - -Wformat-y2k -Wno-format-extra-args\ - -Wno-format-zero-length -Wformat-nonliteral\ - -Wformat-security -Wformat=2 -Wnormalized=nfc $CFLAGS" -fi - if [ "$MINGWCROSS" = "TRUE" ] then MINGWBUILD=$HOSTTYPE-$OSTYPE @@ -78,7 +82,7 @@ then fi OLDPATH=$PATH PATH=/usr/$MINGWSTR/bin:$PATH - CFLAGS="-mtune=pentiumpro -msse2 -O2 $CFLAGS" + CFLAGS="-mtune=pentiumpro -msse2 -g -O2 $CFLAGS" LDFLAGS="-Wl,--large-address-aware $CFLAGS" ARCHFLAGS="--target=\"$MINGWSTR\" \ --with-gnu-ld \ @@ -120,14 +124,14 @@ echo "Configuring build files; options: $CONFIGURE_ARGS" echo echo "Building Gregorio; options:$MAKEOPTS" -make ${MAKEOPTS} || die "build Gregorio" +${MAKE} ${MAKEOPTS} || 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" + ${MAKE} ${MAKEOPTS} fonts || die "build fonts" cd .. echo fi |