raisin: rename MAKE to RAISIN_MAKE

The MAKE environmental variable is used by make for its own purposes. Do
not export it, use RAISIN_MAKE instead.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/README b/README
index 20cde321e8135a98b95610695849f80a8195aa8e..e9a24133ce0947afdcdfc8bea2c1cbdd8151b02f 100644 (file)
--- a/README
+++ b/README
@@ -77,7 +77,7 @@ You can/should rely on the following global variables in your component
 script file:
 
 GIT: git command to run, but prefer the git-checkout.sh script
-MAKE: make command to run
+RAISIN_MAKE: make command to run
 SUDO: sudo command to run
 DISTRO: which Linux distribution we are running on, Debian, Fedora, etc
 ARCH: which architecture we are running on, x86_64, arm32, etc.

diff --git a/components/grub b/components/grub
index 6c3fde469421527331076a6f482ed5a11ca36548..563a28c19c76ab6789cd5d51656b8c51cb89c11b 100644 (file)
--- a/components/grub
+++ b/components/grub
@@ -32,16 +32,16 @@ function grub_build() {
     ./autogen.sh
     ## GRUB32
     ./configure --target=i386 --with-platform=xen
-    $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
+    $RAISIN_MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
     ./grub-mkimage -d grub-core -O i386-xen -c "$BASEDIR"/data/grub-bootstrap.cfg \
       -m ../memdisk.tar -o grub-i386-xen grub-core/*mod
     cp grub-i386-xen "$INST_DIR"/$PREFIX/lib/xen/boot
     ## GRUB64
     if [[ $ARCH = "x86_64" ]]
     then
-        $MAKE clean
+        $RAISIN_MAKE clean
         ./configure --target=amd64 --with-platform=xen
-        $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
+        $RAISIN_MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
         ./grub-mkimage -d grub-core -O x86_64-xen -c "$BASEDIR"/data/grub-bootstrap.cfg \
           -m ../memdisk.tar -o grub-x86_64-xen grub-core/*mod
         cp grub-x86_64-xen "$INST_DIR"/$PREFIX/lib/xen/boot
@@ -55,7 +55,7 @@ function grub_clean() {
     if [[ -d grub-dir ]]
     then
         cd grub-dir
-        $MAKE distclean
+        $RAISIN_MAKE distclean
         cd ..
         rm -rf grub-dir
     fi

diff --git a/components/libvirt b/components/libvirt
index 1cc78113027d013ff9410ff46dba095988273f14..1702fb90debdac16a6dfd421f98a08105e8ada40 100644 (file)
--- a/components/libvirt
+++ b/components/libvirt
@@ -33,8 +33,8 @@ function libvirt_build() {
         --without-vbox --without-lxc --without-esx --without-hyperv       \
         --without-parallels --without-test --with-libvirtd --without-sasl \
         --with-yajl --without-macvtap --without-avahi  --prefix=$PREFIX
-    $MAKE
-    $MAKE --ignore-errors install DESTDIR="$INST_DIR" || true
+    $RAISIN_MAKE
+    $RAISIN_MAKE --ignore-errors install DESTDIR="$INST_DIR" || true
     if [[ $DISTRO = "Debian" ]]
     then
         mkdir -p "$INST_DIR"/etc/init.d
@@ -42,7 +42,7 @@ function libvirt_build() {
         chmod +x "$INST_DIR"/etc/init.d/libvirtd
     elif [[ $DISTRO = "Fedora" || $DISTRO = "CentOS" ]]
     then
-        $MAKE -C daemon libvirtd.init
+        $RAISIN_MAKE -C daemon libvirtd.init
         mkdir -p "$INST_DIR"/etc/rc.d/init.d
         cp daemon/libvirtd.init "$INST_DIR"/etc/rc.d/init.d/libvirtd
         chmod +x "$INST_DIR"/etc/rc.d/init.d/libvirtd
@@ -57,7 +57,7 @@ function libvirt_clean() {
     if [[ -d libvirt-dir ]]
     then
         cd libvirt-dir
-        $MAKE distclean
+        $RAISIN_MAKE distclean
         cd ..
         rm -rf libvirt-dir
     fi

diff --git a/components/qemu b/components/qemu
index e2f6be2750d7a332f57b95126806b3aadcdcc985..8689a18240f4d3352c7f161dc39d4dedb38059db 100644 (file)
--- a/components/qemu
+++ b/components/qemu
@@ -25,8 +25,8 @@ function qemu_build() {
         --disable-kvm \
         --disable-docs \
         --disable-guest-agent
-    $MAKE all
-    $MAKE install DESTDIR="$INST_DIR"
+    $RAISIN_MAKE all
+    $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"
 }
 
@@ -35,7 +35,7 @@ function qemu_clean() {
     if [[ -d qemu-dir ]]
     then
         cd qemu-dir
-        $MAKE distclean
+        $RAISIN_MAKE distclean
         cd ..
         rm -rf qemu-dir
     fi

diff --git a/components/xen b/components/xen
index 13720c8984a5404637b2f007a90a24e8907977c2..a0c003480603b01d8a90fc2127877b58e790bdb1 100644 (file)
--- a/components/xen
+++ b/components/xen
@@ -24,8 +24,8 @@ function xen_build() {
     git-checkout $XEN_URL $XEN_REVISION xen-dir
     cd xen-dir
     ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386
-    $MAKE
-    $MAKE install DESTDIR="$INST_DIR"
+    $RAISIN_MAKE
+    $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"
 }
 
@@ -34,7 +34,7 @@ function xen_clean() {
     if [[ -d xen-dir ]]
     then
         cd xen-dir
-        $MAKE distclean
+        $RAISIN_MAKE distclean
         cd "$BASEDIR"
         rm -rf xen-dir
     fi

diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index c72856ae9c501a6389716040925595ad249769b0..36e176614c07faf02122e0296cd0b45758172f7d 100644 (file)
--- a/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@ -5,7 +5,7 @@ function common_init() {
     export BASEDIR=`pwd`
     export GIT=${GIT-git}
     export SUDO=${SUDO-sudo}
-    export MAKE=${MAKE-make}
+    export RAISIN_MAKE=${MAKE-make}
     export PREFIX=${PREFIX-/usr}
     export INST_DIR=${DESTDIR-dist}