33c8e4dcd12b3522f6584a43787d93a256341caf hiram Sun May 20 19:16:46 2018 -0700 correctly set DESTDIR MACHTYPE and BINDIR when they are set to nothing no redmine diff --git src/parasol/makefile src/parasol/makefile index 06b0602..0bec8b0 100644 --- src/parasol/makefile +++ src/parasol/makefile @@ -1,39 +1,49 @@ include ../inc/localEnvironment.mk +ifeq (${DESTDIR},) + DESTDIR=${HOME}/bin +endif +ifeq (${MACHTYPE},) + MACHTYPE:=$(shell uname -m) +endif +ifeq (${BINDIR},) + BINDIR=${MACHTYPE} +endif + USE_DIRS = \ gensub2 \ para \ paraHub \ paraHubStop \ paraNode \ paraNodeStart \ paraNodeStatus \ paraNodeStop \ paraTestJob \ parasol all: $(USE_DIRS:%=%.all) lib.all: mkdir -p bin cd lib && $(MAKE) # make sure lib is built first, even in a parallel make %.all: lib.all cd $* && echo $* && $(MAKE) install: @echo 'parasol install, please copy ./bin/* where desired ...' userApps: all rsync -a ./bin/* ${DESTDIR}/${BINDIR}/ clean: rm -f */*.o lib/*/*.a rm -f bin/* broad: cd lib && ${MAKE} cd broadNode && ${MAKE} cd broadHub && ${MAKE}