Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

[carl9170fw.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d61418c7999d10453f4c91c7adb382e6931f84f3..56b8101642fa66c0b902bb9be30375bdda4a3f0f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,21 +23,15 @@ case "$1" in
 
                . ./.config
 
-
-               if [ "$CONFIG_CARL9170FW_MAKE_RELEASE" = "y" ]; then
-                       echo -n "Installing firmware..."
-                       tmpfwfile=`mktemp`
-                       cat carlfw/carl9170.fw carlfw/carl9170.dsc > $tmpfwfile
-                       if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
-                          [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
-                               echo -n "Apply miniboot..."
-                               tools/src/miniboot a $tmpfwfile minifw/miniboot.fw
-                       fi
-
-                       sudo install $tmpfwfile /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
-                       rm $tmpfwfile
-                       echo "done."
+               echo -n "Installing firmware..."
+               if [ "$CONFIG_CARL9170FW_BUILD_TOOLS" = "y" ] &&
+                  [ "$CONFIG_CARL9170FW_BUILD_MINIBOOT" = "y" ]; then
+                       echo -n "Apply miniboot..."
+                       tools/src/miniboot a carlfw/carl9170.fw minifw/miniboot.fw
                fi
+
+               sudo install carlfw/carl9170.fw /lib/firmware/carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+               echo "done."
        ;;
 
        *)