X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=autogen.sh;h=873fb7490c17739a1d58ad8703a5670cd6011e6c;hp=d61418c7999d10453f4c91c7adb382e6931f84f3;hb=987f234e4f438a8b925610e2e84426dfe53f57e1;hpb=549126ff5628df58264f157bc3339f1c4e828823

diff --git a/autogen.sh b/autogen.sh
index d61418c..873fb74 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 case "$1" in
 	config)
 		echo "Configuring..."
-		make -C config
+		pushd config
+		cmake .
+		make
+		popd
 		config/conf Kconfig
 		cmake .
 	;;
@@ -13,7 +16,6 @@ case "$1" in
 	compile)
 		echo "Compile time..."
 		make
-
 	;;
 
 	install)
@@ -23,21 +25,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."
 	;;
 
 	*)