Commit 0db4a067 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Blue Swirl
Browse files

default make and install to environment variables


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 3d8df640
...@@ -79,8 +79,6 @@ audio_card_list="ac97 es1370 sb16 hda" ...@@ -79,8 +79,6 @@ audio_card_list="ac97 es1370 sb16 hda"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda" audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda"
block_drv_whitelist="" block_drv_whitelist=""
host_cc="gcc" host_cc="gcc"
make="make"
install="install"
helper_cflags="" helper_cflags=""
libs_softmmu="" libs_softmmu=""
libs_tools="" libs_tools=""
...@@ -363,7 +361,7 @@ GNU/kFreeBSD) ...@@ -363,7 +361,7 @@ GNU/kFreeBSD)
;; ;;
FreeBSD) FreeBSD)
bsd="yes" bsd="yes"
make="gmake" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss"
audio_possible_drivers="oss sdl esd pa" audio_possible_drivers="oss sdl esd pa"
# needed for kinfo_getvmmap(3) in libutil.h # needed for kinfo_getvmmap(3) in libutil.h
...@@ -371,20 +369,20 @@ FreeBSD) ...@@ -371,20 +369,20 @@ FreeBSD)
;; ;;
DragonFly) DragonFly)
bsd="yes" bsd="yes"
make="gmake" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss"
audio_possible_drivers="oss sdl esd pa" audio_possible_drivers="oss sdl esd pa"
;; ;;
NetBSD) NetBSD)
bsd="yes" bsd="yes"
make="gmake" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss"
audio_possible_drivers="oss sdl esd" audio_possible_drivers="oss sdl esd"
oss_lib="-lossaudio" oss_lib="-lossaudio"
;; ;;
OpenBSD) OpenBSD)
bsd="yes" bsd="yes"
make="gmake" make="${MAKE-gmake}"
audio_drv_list="oss" audio_drv_list="oss"
audio_possible_drivers="oss sdl esd" audio_possible_drivers="oss sdl esd"
oss_lib="-lossaudio" oss_lib="-lossaudio"
...@@ -413,8 +411,8 @@ Darwin) ...@@ -413,8 +411,8 @@ Darwin)
;; ;;
SunOS) SunOS)
solaris="yes" solaris="yes"
make="gmake" make="${MAKE-gmake}"
install="ginstall" install="${INSTALL-ginstall}"
ld="gld" ld="gld"
needs_libsunmath="no" needs_libsunmath="no"
solarisrev=`uname -r | cut -f2 -d.` solarisrev=`uname -r | cut -f2 -d.`
...@@ -453,7 +451,7 @@ SunOS) ...@@ -453,7 +451,7 @@ SunOS)
;; ;;
AIX) AIX)
aix="yes" aix="yes"
make="gmake" make="${MAKE-gmake}"
;; ;;
Haiku) Haiku)
haiku="yes" haiku="yes"
...@@ -479,6 +477,9 @@ if [ "$bsd" = "yes" ] ; then ...@@ -479,6 +477,9 @@ if [ "$bsd" = "yes" ] ; then
bsd_user="yes" bsd_user="yes"
fi fi
: ${make=${MAKE-make}}
: ${install=${INSTALL-install}}
if test "$mingw32" = "yes" ; then if test "$mingw32" = "yes" ; then
EXESUF=".exe" EXESUF=".exe"
QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS" QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment