fix

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

diff --git a/gen_compile.sh b/gen_compile.sh
index 5a42e54f8fd190776c071875cfb1d7b20fafde93..1f83673b1bcd6e06b38456aa71067c33fac0e31f 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -192,10 +192,10 @@ compile_kernel() {
        [ "${KERNEL_MAKE}" = "" ] && gen_die "KERNEL_MAKE undefined. Don't know how to compile kernel for arch."
        cd ${KERNEL_DIR}
        print_info 1 "kernel: Starting compile of linux ${KV} ${KERNEL_MAKE}"
-       compile_generic "${KERNEL_MAKE}" kernel
-       if [ "${KERNEL_MAKE_2}" != "" ]
+       compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel
+       if [ "${KERNEL_MAKE_DIRECTIVE_2}" != "" ]
        then
-               compile_generic "${KERNEL_MAKE_2}" kernel
+               compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
        fi
        cp "${KERNEL_BINARY}" "/boot/kernel-${KV}" || gen_die "Could not copy kernel binary to boot"
 }

diff --git a/x86/config.sh b/x86/config.sh
index 504cf26e23d5098fdf793e66a9a549fea7aad52b..29f566f2647bdb3f8dd1d2aa7fa137d2d3aacad5 100644 (file)
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # x86/config.sh
 
-KERNEL_MAKE="bzImage"
-KERNEL_MAKE_2=""
+KERNEL_MAKE_DIRECTIVE="bzImage"
+KERNEL_MAKE_DIRECTIVE_2=""
 KERNEL_BINARY="arch/i386/boot/bzImage"
 
 # The dietlibc portion of busybox is commented out right now

diff --git a/x86_64/config.sh b/x86_64/config.sh
index c063ad18890bf7f04259d9a327e3ae00a0d26bbf..651172c822371f227c0afdcfbdbcc027c993b4f8 100644 (file)
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # x86_64/config.sh
 
-KERNEL_MAKE="bzImage"
-KERNEL_MAKE_2=""
+KERNEL_MAKE_DIRECTIVE="bzImage"
+KERNEL_MAKE_DIRECTIVE_2=""
 KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1