Changeset 3085

Timestamp:

07/02/07 20:15:46 (1 year ago)

Author:

tg

Message:

improve MBSH detection

Files:

• trunk/freewrt/Makefile (modified) (1 diff)
• trunk/freewrt/scripts/scan-tools.sh (modified) (1 diff)

trunk/freewrt/Makefile

@@ -191 +191 @@
-        fi
-        @${GMAKE_INV} tools/install-lbin
-        @if lbin/which mksh >/dev/null 2>&1; then \
-                echo "MBSH:=$$(lbin/which mksh)" >>lbin/prereq.mk; \
-        else \
-                echo "MBSH:=$$(lbin/which bash)" >>lbin/prereq.mk; \
-        fi
-        @echo '===> Prerequisites checked successfully.'
-        @touch $@

trunk/freewrt/scripts/scan-tools.sh

@@ -438 +438 @@
-echo "BMAKE='$bmake'" >>$topdir/lbin/prereq.mk
-
+if grep USE_TOOLS_MKSH=1 $topdir/lbin/prereq.mk >/dev/null 2>&1; then
+        echo "MBSH:=$topdir/lbin/mksh" >>$topdir/lbin/prereq.mk
+elif which mksh >/dev/null 2>&1; then
+        echo "MBSH:=$(which mksh)" >>$topdir/lbin/prereq.mk
+else
+        echo "MBSH:=$${BASH}" >>$topdir/lbin/prereq.mk
+fi
+
-
-cd $topdir