cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Need to define the OS variable at this level too

Browse source
This commit is contained in:
Toshio Kuratomi 2017-01-19 19:50:29 -08:00
parent ccb40e364f
commit e7505220d4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/docsite/Makefile
View file

@ -1,7 +1,8 @@
OS = $(shell uname -s)
SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"):
FORMATTER=../../hacking/module_formatter.py FORMATTER=../../hacking/module_formatter.py
DUMPER=../../hacking/dump_playbook_attributes.py DUMPER=../../hacking/dump_playbook_attributes.py
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) ifeq ($(shell echo $(OS) | egrep -ic 'Darwin|FreeBSD|OpenBSD|DragonFly'),1)
CPUS := $(shell sysctl hw.ncpu|awk '{print $2}') CPUS := $(shell sysctl hw.ncpu|awk '{print $2}')
else else
CPUS := $(shell nproc) CPUS := $(shell nproc)