Commits

Anonymous committed 9f316e2

* fixed using relative path to sub Makefiles

  • Participants
  • Parent commits 3dd562b

Comments (0)

Files changed (1)

File src/actions/make/make_solution.lua

 			_p(1,'@echo "==== Building %s ($(%s_config)) ===="', prj.name, cfgvar)
 
 			local slnpath = solution.getlocation(sln)
-			local prjpath = project.getfilename(prj, make.getmakefilename(prj, true))
+			local prjfile = make.getmakefilename(prj, true)
+			local prjpath = project.getfilename(prj, prjfile)
 			local prjdir = path.getdirectory(path.getrelative(slnpath, prjpath))
 			if prj.external and prj.buildcmd then
 				_p(1, string.format(prj.buildcmd, cfgvar, prj.externalname))
 			else
-				_p(1,'@${MAKE} -C %s -f %s config=$(%s_config)', make.esc(prjdir), make.esc(prjpath), cfgvar)
+				_p(1,'@${MAKE} -C %s -f %s config=$(%s_config)', make.esc(prjdir), make.esc(prjfile), cfgvar)
 			end