From b24f89548092a264bc4d34994cec71eaa9a49f66 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 6 Sep 2010 06:57:18 +0000 Subject: [PATCH] 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 --- BSDmakefile | 11 +++++++++++ makeopts.in | 1 + 2 files changed, 12 insertions(+) create mode 100644 BSDmakefile diff --git a/BSDmakefile b/BSDmakefile new file mode 100644 index 0000000000..de6fc9c4c9 --- /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 750a41d7c2..2680968681 100644 --- 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@