From 9846714376dc6e9cc0537b52269c1fc5fd5f8578 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Thu, 6 Feb 2003 17:21:25 +0000 Subject: [PATCH] Another fix for OpenBSD. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@700 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/config_proginfo | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sc2/build/config_proginfo b/sc2/build/config_proginfo index 556b778d8..a17f24eaa 100644 --- a/sc2/build/config_proginfo +++ b/sc2/build/config_proginfo @@ -15,6 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +OSNAME=`uname -s` + # Describe the programs (possibly) used: PROG_gcc_NAME="GNU C compiler" PROG_gcc_FILE="gcc" @@ -27,11 +29,14 @@ PROG_sed_ACTION="" PROG_sed_VERSION='' PROG_make_NAME="Make" -if [ `uname` = 'FreeBSD' ]; then - PROG_make_FILE="gmake" -else - PROG_make_FILE="make" -fi +case "$OSNAME" in + FreeBSD|OpenBSD) + PROG_make_FILE="gmake" + ;; + *) + PROG_make_FILE="make" + ;; +esac PROG_make_ACTION="" PROG_make_VERSION='' @@ -49,8 +54,6 @@ PROG_windres_VERSION='windres --version' # Describe the libaries (possibly) used: LIB_SDL_NAME="Simple DirectMedia Layer" -OSNAME=`uname -s` - case "$OSNAME" in FreeBSD) LIB_SDL_CFLAGS='$(sdl11-config --cflags)' ;; *) LIB_SDL_CFLAGS='$(sdl-config --cflags)' ;; @@ -107,7 +110,7 @@ LIB_vorbis_VERSION="" LIB_vorbisfile_NAME="Vorbisfile" case "$OSNAME" in - FreeBSD) + FreeBSD|OpenBSD) LIB_vorbisfile_CFLAGS="-I/usr/local/include" LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis" ;;