diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-11-24 11:35:45 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-11-24 11:35:45 -0800 |
| commit | e8ee55a502b7c83a7ab8c2060cceb363307aae83 (patch) | |
| tree | d5a921f9a2b0d2b838c151d75a1bfe35698aaa69 | |
| parent | 212fa083e2a2ce857a7a1e84e445215a77fe4e0c (diff) | |
| parent | b4c0cb65debf37ec4e15d468ecb4f491b36fc9da (diff) | |
| download | monzero-gui-e8ee55a502b7c83a7ab8c2060cceb363307aae83.tar.gz monzero-gui-e8ee55a502b7c83a7ab8c2060cceb363307aae83.tar.xz monzero-gui-e8ee55a502b7c83a7ab8c2060cceb363307aae83.zip | |
Merge pull request #3236
b4c0cb65 Makefile: refactor USE_SINGLE_BUILDDIR=OFF builddir path (xiphon)
| -rw-r--r-- | Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -6,15 +6,20 @@ ifneq ($(dotgit), .git/config) USE_SINGLE_BUILDDIR=1 endif -subbuilddir:=$(shell echo `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`) +builddir := build +topdir := ../.. ifeq ($(USE_SINGLE_BUILDDIR), OFF) - builddir := build/"$(subbuilddir)" - topdir := ../../../.. - deldirs := $(builddir) + os := $(shell echo `uname | sed -e 's|[:/\\ \(\)]|_|g'`) + builddir := $(builddir)/$(os) + topdir := $(topdir)/.. + + branch:=$(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g') + builddir := $(builddir)/$(branch) + topdir := $(topdir)/.. + + deldirs := $(builddir) else - builddir := build - topdir := ../.. - deldirs := $(builddir)/debug $(builddir)/release $(builddir)/fuzz + deldirs := $(builddir)/debug $(builddir)/release $(builddir)/fuzz endif default: |