Use DESTDIR instead of DEST_DIR just like with cmake (#439)

Author: Nicolas Cornu

extra/nrnivmodl-core.in

@@ -26,7 +26,7 @@ params_MODS_PATH="."
 params_BUILD_TYPE="@COMPILE_LIBRARY_TYPE@"
 
 # prefix for common options : make sure to rename these if options are changed.
-MAKE_OPTIONS="MECHLIB_SUFFIX MOD2CPP_BINARY MOD2CPP_RUNTIME_FLAGS DEST_DIR INCFLAGS LINKFLAGS MODS_PATH VERBOSE BUILD_TYPE"
+MAKE_OPTIONS="MECHLIB_SUFFIX MOD2CPP_BINARY MOD2CPP_RUNTIME_FLAGS DESTDIR INCFLAGS LINKFLAGS MODS_PATH VERBOSE BUILD_TYPE"
 
 # parse CLI args
 while getopts "n:m:a:d:i:l:Vp:b:h" OPT; do
@@ -42,7 +42,7 @@ while getopts "n:m:a:d:i:l:Vp:b:h" OPT; do
         params_MOD2CPP_RUNTIME_FLAGS="$OPTARG";;
     d)
         # destination install directory
-        params_DEST_DIR="$OPTARG";;
+        params_DESTDIR="$OPTARG";;
     i)
         # extra include flags
         params_INCFLAGS="$OPTARG";;
@@ -134,7 +134,7 @@ for param in $MAKE_OPTIONS; do
 done
 
 # if -d (deploy) provided, call "make install"
-if [ "$params_DEST_DIR" ]; then
+if [ "$params_DESTDIR" ]; then
     make_params+=("install")
 fi
 

extra/nrnivmodl_core_makefile.in

@@ -12,7 +12,7 @@ COMMA_OP =,
 MECHLIB_SUFFIX =
 MODS_PATH = .
 OUTPUT_DIR = @CMAKE_HOST_SYSTEM_PROCESSOR@
-DEST_DIR =
+DESTDIR =
 TARGET_LIB_TYPE = $(BUILD_TYPE)
 
 # CoreNEURON installation directories
@@ -132,7 +132,7 @@ mod_ispc_objs = $(addprefix $(MOD_OBJS_DIR)/,$(addsuffix .obj,$(basename $(mod_i
 # We use $ORIGIN (@loader_path in OSX)
 ORIGIN_RPATH := $(if $(filter Darwin,$(OS_NAME)),@loader_path,$$ORIGIN)
 SONAME_OPTION := -Wl,$(if $(filter Darwin,$(OS_NAME)),-install_name${COMMA_OP}@rpath/,-soname${COMMA_OP})$(notdir ${COREMECH_LIB_PATH})
-LIB_RPATH = $(if $(DEST_DIR),$(DEST_DIR)/lib,$(ORIGIN_RPATH))
+LIB_RPATH = $(if $(DESTDIR),$(DESTDIR)/lib,$(ORIGIN_RPATH))
 
 # All objects used during build
 ALL_OBJS = $(MOD_FUNC_OBJ) $(DIMPLIC_OBJ) $(mod_cpp_objs) $(mod_ispc_objs)
@@ -233,9 +233,9 @@ $(MOD_OBJS_DIR):
 
 # install binary and libraries
 install: $(SPECIAL_EXE) coremech_lib_target
-	install -d $(DEST_DIR)/bin $(DEST_DIR)/lib
-	install ${COREMECH_LIB_PATH} $(DEST_DIR)/lib
-	install $(SPECIAL_EXE) $(DEST_DIR)/bin
+	install -d $(DESTDIR)/bin $(DESTDIR)/lib
+	install ${COREMECH_LIB_PATH} $(DESTDIR)/lib
+	install $(SPECIAL_EXE) $(DESTDIR)/bin
 
 .PHONY: build_always