Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/Makefile b/Makefile
index 6f126338719bd43e10357b27359a85c7f7d3ad8a..054d57b641bd89c6892e8c30500dc997f3bed4fc 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,10 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
 EXE_OBJS = $(PLAF_EXE_OBJS)
 
 default: misc/wordsize
-       make `./misc/target`
+       $(MAKE) `./misc/target`
 
 help:
-       @echo "Run 'make' with one of the following parameters:"
+       @echo "Run '$(MAKE)' with one of the following parameters:"
        @echo ""
        @echo "freebsd-x86-32"
        @echo "freebsd-x86-64"

diff --git a/extra/io/unix/freebsd/freebsd.factor b/extra/io/unix/freebsd/freebsd.factor
index 2aad0bdb1ae9e1f3f1a99d76c69b6a07404d086f..65b4a6f0f7f606487d6fb073f552d1c431691d00 100644 (file)
--- a/extra/io/unix/freebsd/freebsd.factor
+++ b/extra/io/unix/freebsd/freebsd.factor
@@ -1,5 +1,5 @@
 IN: io.unix.freebsd
-USING: io.unix.bsd io.backend core-foundation.fsevents ;
+USING: io.unix.bsd io.backend ;
 
 TUPLE: freebsd-io ;
 

diff --git a/misc/target b/misc/target
index 2be071c17dedefe1536621ba16f23e0d8a415b99..880de8f47a0794c6b2abd438564b122b1abd3223 100755 (executable)
--- a/misc/target
+++ b/misc/target
@@ -1,6 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
+if [ \( `uname -s ` = FreeBSD \) -a \( `uname -p` = i386 \) ]
+then
+  echo freebsd-x86-32
+elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
 then
   echo macosx-ppc
 elif [ `uname -s` = Darwin ]
@@ -17,4 +20,4 @@ then
   echo winnt-x86-`./misc/wordsize`
 else
   echo help
-fi
\ No newline at end of file
+fi