Permalink
Browse files

Merge branch 'next'

  • Loading branch information...
2 parents c010561 + 8c2fbfc commit 36e86c3ce52d3692aaead104ad8bbd5ee3f685e6 @jj1bdx committed Nov 20, 2016
Showing with 613 additions and 266 deletions.
  1. +1 −6 Makefile
  2. +612 −260 erlang.mk
View
@@ -1,10 +1,5 @@
-# See http://stackoverflow.com/questions/11775109/determine-if-makefile-is-executed-with-gmake
-# and http://stackoverflow.com/questions/11775197/how-to-execute-gmake-make-from-a-bash-script-file
-# for the GNUMAKE detection script
# If stock `make` is GNU Make, use `make`; otherwise use `gmake`
-GNUMAKE=@`sh -c \
- 'if (make --version | grep "^GNU Make" 2>&1 >/dev/null); \
- then echo make; else echo gmake; fi' 2>/dev/null`
+GNUMAKE=@`sh -c 'gmakebin=\`which gmake\`; if [ ! -z $$gmakebin -a -x $$gmakebin ]; then echo gmake; else echo make; fi'`
TARGETMAKEFILE= ./Makefile.sfmt
Oops, something went wrong.

0 comments on commit 36e86c3

Please sign in to comment.