Changeset 2856f83 in freewrt

Timestamp:

Jul 16, 2006, 10:01:34 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

003e3c1

Parents:

ba108ca

Message:

it gets even weirder with support for Darwin 7.9.0 ...

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@240 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• Makefile (modified) (3 diffs)
• scripts/which.mac (added)

Makefile

@@ -102 +102 @@
         fi
         @mkdir lbin
-        @if which gmake >/dev/null 2>&1; then \
-                ln -s $$(which gmake) lbin/gmake 2>/dev/null || \
-                    ln -s /usr/bin/make lbin/gmake; \
+        @if which nonexistent 2>&1 | grep '^no '; then \
+                cp scripts/which.mac lbin/which; \
+                chmod 555 lbin/which; \
         else \
-                ln -s $$(which make) lbin/gmake; \
+                ln -s $$(which which) lbin/which; \
         fi
-        @if ! which md5sum >/dev/null 2>&1; then \
+        @if lbin/which gmake >/dev/null 2>&1; then \
+                ln -s $$(lbin/which gmake) lbin/gmake; \
+        else \
+                ln -s $$(lbin/which make) lbin/gmake; \
+        fi
+        @if ! lbin/which md5sum >/dev/null 2>&1; then \
                 cp scripts/md5sum.bsd lbin/md5sum; \
                 chmod 555 lbin/md5sum; \
@@ -114 +119 @@
         @if test x"$$(uname)" = x"MirBSD"; then \
                 sed -e 's!@@FromOS@@!MirBSD!g' -e 's!@@ToOS@@!OpenBSD!g' \
-                    -e "s!@@PROG@@!$$(which uname)!g" \
+                    -e "s!@@PROG@@!$$(lbin/which uname)!g" \
                     <scripts/uname.fake >lbin/uname; \
                 chmod 555 lbin/uname; \
         fi
-        @echo "BASH=$$(which bash)" >>lbin/prereq.mk
+        @echo "BASH=$$(lbin/which bash)" >>lbin/prereq.mk
         @echo "GNU_HOST_NAME=$$(${CC} -dumpmachine | \
             sed -e 's!mirbsd!openbsd!g')" >>lbin/prereq.mk
@@ -132 +137 @@
         @echo "_PATH=$$PATH" >>lbin/prereq.mk
         @echo "PATH=$$(pwd)/lbin:$$PATH" >>lbin/prereq.mk
-        @echo "SHELL=$$(which bash)" >>lbin/prereq.mk
+        @echo "SHELL=$$(lbin/which bash)" >>lbin/prereq.mk
         @echo "export BASH HOSTCC HOSTCFLAGS LC_ALL MAKE OStype PATH SHELL" \
             >>lbin/prereq.mk
         @env NO_ERROR=${NO_ERROR} bash scripts/scan-tools.sh
-        @ln -s $$(which ${CC}) lbin/gcc
+        @ln -s $$(lbin/which ${CC}) lbin/gcc
         @echo '===> Prerequisites checked successfully.'
         @touch $@