if $(SPYNNAKER_INSTALL_DIR)

Author: Christian-B

c_models/makefiles/extra.mk

@@ -1,8 +1,5 @@
-ifndef SPYNNAKER_INSTALL_DIR:
-    CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
-    # assume parallel clone
-    SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)
-endif
+CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
+SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
 
 # Work out the top-level project folder
 MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

c_models/makefiles/extra_neuron.mk

@@ -1,8 +1,5 @@
-ifndef SPYNNAKER_INSTALL_DIR:
-    CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
-    # assume parallel clone
-    SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)
-endif
+CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
+SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
 
 # Work out the top-level project folder
 MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))

c_models/makefiles/extra_synapse.mk

@@ -1,8 +1,5 @@
-ifndef SPYNNAKER_INSTALL_DIR:
-    CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
-    # assume parallel clone
-    SPYNNAKER_INSTALL_DIR := $(abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)
-endif
+CUR_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/)
+SPYNNAKER_INSTALL_DIR := $(strip $(if $(SPYNNAKER_INSTALL_DIR), $(SPYNNAKER_INSTALL_DIR), (abspath $(CUR_DIR)/../../../sPyNNaker/neural_modelling)))
 
 # Work out the top-level project folder
 MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))