krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into altdorf

Browse Source 
Because of OpenSSL Tarball fetching
This commit is contained in:
Christian Obersteiner
2015-06-14 21:08:17 +02:00
parent 7734620db4 fdc9a14042
commit 9a630bf3c6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
GLUON_GIT_REF := v2015.1 GLUON_GIT_REF := 620f01f513012757a66d782ef0e930245fcdc1e8
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
@@ -16,9 +16,7 @@ else
GLUON_BRANCH := experimental GLUON_BRANCH := experimental
endif endif
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) GLUON_MAKE := ${MAKE} -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}