All make-based projects: Use $(MAKE) instead of 'make' for all commands, per the standard requirements for nested Makefiles. See GNU Make docs for $(MAKE) for details.

stuarteberg · stuarteberg · commit 8bd1c0c56d4c · 2014-01-03T15:31:31.000-05:00
diff --git a/README.md b/README.md
@@ -209,9 +209,9 @@ ExternalProject_Add(${libtiff_NAME}
         --prefix=${BUILDEM_DIR}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 endif (NOT libtiff_NAME)
diff --git a/ann.cmake b/ann.cmake
@@ -34,9 +34,9 @@ ExternalProject_Add(${ann_NAME}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
 
 
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
-    TEST_COMMAND        "" # ${BUILDEM_ENV_STRING} make check
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
+    TEST_COMMAND        "" # ${BUILDEM_ENV_STRING} $(MAKE) check
 )
 
 set_target_properties(${ann_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/atlas.cmake b/atlas.cmake
@@ -74,9 +74,9 @@ ExternalProject_Add(${atlas_NAME}
         --shared 
         --prefix=${BUILDEM_DIR} 
         --with-netlib-lapack-tarfile=${lapack_FILE}
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set (ENV{ATLAS} ${BUILDEM_DIR}/lib:${BUILDEM_DIR}/lib/libtatlas.so:${BUILDEM_DIR}/lib/libsatlas.so)
diff --git a/blockedarray.cmake b/blockedarray.cmake
@@ -43,7 +43,7 @@ ExternalProject_Add(${blockedarray_NAME}
     
     # blockedarray doesn't support a seperate install location.
     # Its output .so is copied directly into the source tree and used from there.
-    ###INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    ###INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
     INSTALL_COMMAND     ""
 )
 
diff --git a/chatty.cmake b/chatty.cmake
@@ -39,8 +39,8 @@ ExternalProject_Add(${chatty_NAME}
         -DBoost_LIBRARY_DIRS=${BUILDEM_DIR}/lib
     	${chatty_SRC_DIR}
     	
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 endif (NOT chatty_NAME)
diff --git a/cppunit.cmake b/cppunit.cmake
@@ -25,10 +25,10 @@ ExternalProject_Add(${cppunit_NAME}
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ${BUILDEM_ENV_STRING} ./configure 
         --prefix ${BUILDEM_DIR}
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    TEST_COMMAND        make check
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    TEST_COMMAND        $(MAKE) check
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${cppunit_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/dlib.cmake b/dlib.cmake
@@ -33,8 +33,8 @@ ExternalProject_Add(${dlib_NAME}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
 
 
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
     TEST_COMMAND        ""
 )
 
diff --git a/dos2unix.cmake b/dos2unix.cmake
@@ -24,9 +24,9 @@ ExternalProject_Add(${dos2unix_NAME}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ""
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make prefix=${BUILDEM_DIR}
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE) prefix=${BUILDEM_DIR}
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make prefix=${BUILDEM_DIR} install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) prefix=${BUILDEM_DIR} install
 )
 
 set_target_properties(${dos2unix_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/doxygen.cmake b/doxygen.cmake
@@ -25,9 +25,9 @@ ExternalProject_Add(${doxygen_NAME}
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ${BUILDEM_ENV_STRING} ./configure 
         --prefix ${BUILDEM_DIR}
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${doxygen_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/emdata.cmake b/emdata.cmake
@@ -30,7 +30,7 @@ ExternalProject_Add(${emdata_NAME}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ${BUILDEM_ENV_STRING} ${CMAKE_COMMAND} -DBUILDEM_DIR=${BUILDEM_DIR} ${emdata_SRC_DIR}
-    BUILD_COMMAND       make
+    BUILD_COMMAND       $(MAKE)
     TEST_COMMAND        ${BUILDEM_ENV_STRING} ${BUILDEM_TEST_DIR}/test_encoder
     INSTALL_COMMAND     ""
 )
diff --git a/fontconfig.cmake b/fontconfig.cmake
@@ -38,9 +38,9 @@ if (NOT fontconfig_NAME)
         LDFLAGS=-L${BUILDEM_DIR}/lib
         LIBXML2_CFLAGS=-I${BUILDEM_DIR}/include/libxml2 LIBXML2_LIBS=-lxml2
         FREETYPE_CFLAGS=-I${BUILDEM_DIR}/include/freetype2 FREETYPE_LIBS=-lfreetype
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
     )
   
 
diff --git a/freetype2.cmake b/freetype2.cmake
@@ -30,9 +30,9 @@ ExternalProject_Add(${freetype2_NAME}
         --enable-shared
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${freetype_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/glfw.cmake b/glfw.cmake
@@ -32,9 +32,9 @@ ExternalProject_Add(${glfw_NAME}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ""
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make ${MAKE_PLATFORM}
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE) ${MAKE_PLATFORM}
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} PREFIX=${BUILDEM_DIR} make ${MAKE_PLATFORM}-dist-install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} PREFIX=${BUILDEM_DIR} $(MAKE) ${MAKE_PLATFORM}-dist-install
 )
 
 set_target_properties(${glfw_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/gmp.cmake b/gmp.cmake
@@ -27,10 +27,10 @@ ExternalProject_Add(${gmp_NAME}
         --prefix=${BUILDEM_DIR}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${gmp_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/gtest.cmake b/gtest.cmake
@@ -26,7 +26,7 @@ ExternalProject_Add(${gtest_NAME}
     CONFIGURE_COMMAND   ${BUILDEM_ENV_STRING} ${CMAKE_COMMAND} ${gtest_SRC_DIR} 
         -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
     INSTALL_COMMAND     "" 
 )
diff --git a/hdf5.cmake b/hdf5.cmake
@@ -40,8 +40,8 @@ ExternalProject_Add(${hdf5_NAME}
         -DHDF5_ENABLE_Z_LIB_SUPPORT=ON
 #        -DBUILD_TESTING=ON
 BUILD_COMMAND           ${BUILDEM_ENV_STRING} $(MAKE)
-#    TEST_COMMAND        make check
-    INSTALL_COMMAND         ${BUILDEM_ENV_STRING} make install
+#    TEST_COMMAND        $(MAKE) check
+    INSTALL_COMMAND         ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${hdf5_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/ilastik.cmake b/ilastik.cmake
@@ -85,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             -DPYTHON_NUMPY_INCLUDE_DIR=${PYTHON_PREFIX}/lib/python2.7/site-packages/numpy/core/include
             -DVIGRA_NUMPY_CORE_LIBRARY=${PYTHON_PREFIX}/lib/python2.7/site-packages/vigra/vigranumpycore.so
             ${lazyflow_SRC_DIR}/lazyflow/drtile
-        BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+        BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
         TEST_COMMAND        ${BUILDEM_DIR}/bin/ilastik_headless_test
         INSTALL_COMMAND     ""
     )
@@ -103,7 +103,7 @@ else()
 #            -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
 #            -DVIGRA_ROOT=${BUILDEM_DIR}
             ${lazyflow_SRC_DIR}/lazyflow/drtile
-        BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+        BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
         TEST_COMMAND        ${BUILDEM_DIR}/bin/ilastik_headless_test
         INSTALL_COMMAND     ""
     )
diff --git a/ilmbase.cmake b/ilmbase.cmake
@@ -42,7 +42,7 @@ ExternalProject_Add(${ilmbase_NAME}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
     BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${ilmbase_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/lemon.cmake b/lemon.cmake
@@ -43,9 +43,9 @@ ExternalProject_Add(${lemon_NAME}
         -DGLPK_INCLUDE_DIR=
         -DGLPK_ROOT_DIR=
 
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
 )
 
 set_target_properties(${lemon_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/leveldb.cmake b/leveldb.cmake
@@ -29,7 +29,7 @@ if (${APPLE})
         UPDATE_COMMAND    ""
         PATCH_COMMAND     ""
         CONFIGURE_COMMAND ""
-        BUILD_COMMAND     ${BUILDEM_ENV_STRING} make
+        BUILD_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE)
         BUILD_IN_SOURCE   1
         INSTALL_COMMAND   ${CMAKE_COMMAND} -E copy 
             ${leveldb_SRC_DIR}/libleveldb.dylib.${leveldb_RELEASE} ${BUILDEM_LIB_DIR}/libleveldb.dylib
@@ -44,7 +44,7 @@ elseif (${UNIX})
         UPDATE_COMMAND    ""
         PATCH_COMMAND     ""
         CONFIGURE_COMMAND ""
-        BUILD_COMMAND     ${BUILDEM_ENV_STRING} make
+        BUILD_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE)
         BUILD_IN_SOURCE   1
         INSTALL_COMMAND   ${CMAKE_COMMAND} -E copy 
             ${leveldb_SRC_DIR}/libleveldb.so.${leveldb_RELEASE} ${BUILDEM_LIB_DIR}/libleveldb.so
diff --git a/libfftw.cmake b/libfftw.cmake
@@ -29,7 +29,7 @@ ExternalProject_Add(${libfftw_NAME}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
         BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 # Add additional steps to build and install the fftw single-precision libraries.
@@ -49,13 +49,13 @@ ExternalProject_Add_Step(${libfftw_NAME} singlefloat-configure
 # build single-precision
 ExternalProject_Add_Step(${libfftw_NAME} singlefloat-build
     DEPENDEES singlefloat-configure
-    COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} make
+    COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} $(MAKE)
 )
 
 # install single-precision
 ExternalProject_Add_Step(${libfftw_NAME} singlefloat-install
     DEPENDEES singlefloat-build
-    COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} make install
+    COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${libfftw_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/libjansson.cmake b/libjansson.cmake
@@ -24,8 +24,8 @@ ExternalProject_Add(${libjansson_NAME}
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ${libjansson_SRC_DIR}/configure --prefix=${BUILDEM_DIR} --enable-shared
     URL      http://www.digip.org/jansson/releases/jansson-2.4.tar.gz
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 endif (NOT libjansson_NAME)
diff --git a/libjpeg.cmake b/libjpeg.cmake
@@ -29,8 +29,8 @@ ExternalProject_Add(${libjpeg_NAME}
         CPPFLAGS=-I${BUILDEM_DIR}/include
         BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE) LIBTOOL=./libtool # Must use the libtool that is built in place by the libjpeg Makfile (not the system libtool!)
     BUILD_IN_SOURCE     1
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make LIBTOOL=./libtool install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) LIBTOOL=./libtool install
 )
 
 set_target_properties(${libjpeg_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/libpng.cmake b/libpng.cmake
@@ -37,7 +37,7 @@ ExternalProject_Add(${libpng_NAME}
         -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
         BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${libpng_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/libtiff.cmake b/libtiff.cmake
@@ -41,7 +41,7 @@ ExternalProject_Add(${libtiff_NAME}
         --disable-jbig
         BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${libtiff_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/libxml2.cmake b/libxml2.cmake
@@ -35,9 +35,9 @@ if (NOT libxml2_NAME)
         --with-sax1
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
     )
 
 
diff --git a/lmdb.cmake b/lmdb.cmake
@@ -25,9 +25,9 @@ ExternalProject_Add(${lmdb_NAME}
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ""
     BUILD_IN_SOURCE     1
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make test
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install prefix=${BUILDEM_DIR} -i
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) test
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install prefix=${BUILDEM_DIR} -i
 )
 
 set_target_properties(${lmdb_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/mpfr.cmake b/mpfr.cmake
@@ -31,10 +31,10 @@ ExternalProject_Add(${mpfr_NAME}
         --prefix=${BUILDEM_DIR}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
     BUILD_IN_SOURCE     1
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${mpfr_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/openblas.cmake b/openblas.cmake
@@ -22,9 +22,9 @@ ExternalProject_Add(${openblas_NAME}
     UPDATE_COMMAND      ""
     PATCH_COMMAND       ""
     CONFIGURE_COMMAND   ""
-    BUILD_COMMAND       make NO_AVX=1 NO_AFFINITY=1 -j8
+    BUILD_COMMAND       $(MAKE) NO_AVX=1 NO_AFFINITY=1 -j8
     BUILD_IN_SOURCE     1
-    INSTALL_COMMAND     make PREFIX=${BUILDEM_DIR} install &&
+    INSTALL_COMMAND     $(MAKE) PREFIX=${BUILDEM_DIR} install &&
                         ln -fs libopenblas.so ${BUILDEM_DIR}/lib/libblas.so &&
                         ln -fs libopenblas.so ${BUILDEM_DIR}/lib/liblapack.so
 )
diff --git a/opencv.cmake b/opencv.cmake
@@ -38,8 +38,8 @@ ExternalProject_Add(${opencv_NAME}
         -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR}
         -DCMAKE_PREFIX_PATH=${BUILDEM_DIR}
         BUILD_COMMAND           ${BUILDEM_ENV_STRING} $(MAKE)
-#    TEST_COMMAND        ${BUILDEM_ENV_STRING} make check
-    INSTALL_COMMAND         ${BUILDEM_ENV_STRING} make install
+#    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) check
+    INSTALL_COMMAND         ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${opencv_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/openexr.cmake b/openexr.cmake
@@ -53,7 +53,7 @@ ExternalProject_Add(${openexr_NAME}
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
     BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE)
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${openexr_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/openldap.cmake b/openldap.cmake
@@ -31,10 +31,10 @@ ExternalProject_Add(${openldap_NAME}
         --disable-slapd
         LDFLAGS=${BUILDEM_LDFLAGS}
         CPPFLAGS=-I${BUILDEM_DIR}/include
-    BUILD_COMMAND       ${BUILDEM_ENV_STRING} make depend
+    BUILD_COMMAND       ${BUILDEM_ENV_STRING} $(MAKE) depend
     BUILD_IN_SOURCE     1
-    TEST_COMMAND        ${BUILDEM_ENV_STRING} make 
-    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} make install
+    TEST_COMMAND        ${BUILDEM_ENV_STRING} $(MAKE) 
+    INSTALL_COMMAND     ${BUILDEM_ENV_STRING} $(MAKE) install
 )
 
 set_target_properties(${openldap_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)
diff --git a/openssl.cmake b/openssl.cmake
diff --git a/openvdb.cmake b/openvdb.cmake
diff --git a/pgmlink.cmake b/pgmlink.cmake
diff --git a/protobuf.cmake b/protobuf.cmake
diff --git a/pyqt4.cmake b/pyqt4.cmake
diff --git a/python.cmake b/python.cmake
diff --git a/qt4.cmake b/qt4.cmake
diff --git a/raveler-utils.cmake b/raveler-utils.cmake
diff --git a/sip.cmake b/sip.cmake
diff --git a/snappy.cmake b/snappy.cmake
diff --git a/tbb.cmake b/tbb.cmake
diff --git a/thrift.cmake b/thrift.cmake
diff --git a/vigra.cmake b/vigra.cmake
diff --git a/vtk.cmake b/vtk.cmake
diff --git a/zlib.cmake b/zlib.cmake
