Merge branch 'master' into next

* master:
  * Redirect 'make' on BSD to gmake

Conflicts:
	doc/UPDATES

BSDmakefile

@@ -0,0 +1,16 @@
+.PHONY: default check_gmake debug static dynamic clean distclean
+
+default: check_gmake
+	@gmake
+check_gmake:
+	@which gmake > /dev/null 2>&1 || (echo "Please install gmake" && exit 0)
+debug: check_gmake
+	@gmake debug
+static: check_gmake
+	@gmake static
+dynamic: check_gmake
+	@gmake dynamic
+clean: check_gmake
+	@gmake clean
+distclean: check_gmake
+	@gmake distclean

doc/UPDATES

@@ -9,6 +9,8 @@
   Compile on the oldest OS you want to support, and ensure newer ones have
   all necessary compat libraries.
 
+* 'make' on BSD will now redirect to gmake.
+
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart
   * Fixed parsing errors in .chanset