Merge branch 'master' of https://github.com/ffrgb/site-ffrgb into experimental

This commit is contained in:
Bastian 2015-05-28 16:57:56 +02:00
commit 5173e6fc82

View File

@ -17,13 +17,11 @@ else
endif endif
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
JOBS = 1 JOBS = 1
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} \ GLUON_BRANCH=${GLUON_BRANCH} \
BROKEN=1
all: info all: info
${MAKE} manifest ${MAKE} manifest