add make variable

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@16 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d5503a89e46af4acd410aade9e0f6e679b716b1f..94580f7b4ebbb75a801d38221061108364bcaa75 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -29,6 +29,7 @@ usage() {
   echo "       --utils-cc=<compiler>   Compiler to use for utils (e.g. busybox, modutils)"
   echo "       --utils-ld=<linker>     Linker to use for utils"
   echo "       --utils-as=<assembler>  Assembler to use for utils"
+  echo "       --make=<make prog>      GNU Make to use"
   echo "  Internals"
   echo "       --arch-override=<arch>  Force to arch instead of autodetect (cross-compile?)"
   echo "       --busybox-config=<file> Busybox configuration file to use"
@@ -76,6 +77,10 @@ parse_cmdline() {
                                CMD_UTILS_AS=`parse_opt "${x}"`
                                print_info 2 "CMD_UTILS_AS: $CMD_UTILS_AS"
                        ;;
+                       --make*)
+                               CMD_MAKE=`parse_opt "${x}"`
+                               print_info 2 "CMD_MAKE: $CMD_MAKE"
+                       ;;
                        
                        --debuglevel*)
                                CMD_DEBUGLEVEL=`parse_opt "${x}"`

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 42df2585b9db7d931f4c96d3870010ee6b788807..a11bdbc04fdaeec7e6d19084f92f98882a3caa2c 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -28,6 +28,16 @@ determine_real_args() {
 
        get_KV
 
+       if [ "${CMD_MAKE}" != "" ]
+       then
+               MAKE="${CMD_MAKE}"
+       fi
+
+       if [ "${MAKE}" = "" ]
+       then
+               MAKE="make"
+       fi
+
        if [ "${CMD_KERNEL_CC}" != "" ]
        then
                KERNEL_CC="${CMD_KERNEL_CC}"

diff --git a/x86/config.sh b/x86/config.sh
index b8043214b5ae6d5101f372b2cb75fd982475610a..b29ebf3c0831eff3c947861d6431a8556cf5ecaa 100644 (file)
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -9,6 +9,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
+MAKE=make
+
 KERNEL_CC=gcc
 KERNEL_AS=as
 KERNEL_LD=ld

diff --git a/x86_64/config.sh b/x86_64/config.sh
index 59e7e850f72bb85d041a67d62a2f0b9d3d792d8a..df2af7a2d092d52dd98e7bd50fe8f82bbf74fc62 100644 (file)
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -2,10 +2,13 @@
 # x86_64/config.sh
 
 KERNEL_MAKE="bzImage"
+KERNEL_MAKE_2=""
 KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1
 
+MAKE=make
+
 KERNEL_CC=gcc
 KERNEL_AS=as
 KERNEL_LD=ld