Merged revisions 285090 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285090 | tilghman | 2010-09-06 01:56:07 -0500 (Mon, 06 Sep 2010) | 16 lines

  Merged revisions 285089 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r285089 | tilghman | 2010-09-06 01:55:17 -0500 (Mon, 06 Sep 2010) | 9 lines

    Merged revisions 285088 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r285088 | tilghman | 2010-09-06 01:54:18 -0500 (Mon, 06 Sep 2010) | 2 lines

      Silly convenience script for BSD platforms.
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/BSDmakefile b/BSDmakefile
new file mode 100644 (file)
index 0000000..de6fc9c
--- /dev/null
+++ b/BSDmakefile
@@ -0,0 +1,11 @@
+# This is a convenience script for systems on which BSD make is the default,
+# such that typing 'make' will do what people expect, instead of producing an
+# error (due to incompatibilities between BSD make and GNU make).
+
+.include "makeopts"
+
+all::
+       $(MAKE)
+
+$(.TARGETS)::
+       $(MAKE) $(.TARGETS)

diff --git a/makeopts.in b/makeopts.in
index 750a41d7c25a3599d57e8b27c84e480d7a8129fb..26809686810825c260576efc47217de6bd15e34a 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -12,6 +12,7 @@ AWK=@AWK@
 BISON=@BISON@
 FLEX=@FLEX@
 GREP=@GREP@
+MAKE=@GNU_MAKE@
 AR=@AR@
 RANLIB=@RANLIB@
 FIND=@FIND@