[sr-dev] git:master:d2c82c2f: Makefile: detect path to core src folder

Module: kamailio Branch: master Commit: d2c82c2f8187bc2503ca39dc91ae691938b7014a URL: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T10:26:00+01:00 Makefile: detect path to core src folder - it's different for modules and utils, after the files relocation --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… Patch: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3ec0026..4a8bb47 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -32,7 +32,12 @@ ifeq (,$(main_makefile)) # if not called from the main makefile (module, lib or ut): # include config.mak, but if not present or incomplete (makefile_defs!=1) # don't export the vars) -COREPATH?= ../../src/ +DEFCOREPATH = ../../src +ifneq ("$(wildcard $(DEFCOREPATH))","") +COREPATH?= ../../src +else +COREPATH?= ../.. +endif include $(COREPATH)/config.mak ifeq ($(quiet),verbose) $(info config.mak included)