aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2017-05-15 16:14:37 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-05-15 16:14:37 +0200
commitbf13f4a8b4f78702f5a3d8a4781e53a47e41f82c (patch)
treecf748c96a75969acc56a1617c1454d8238e83337 /Makefile
parentf51ece1413bbb1cecd908528eba9f1f0f6d21224 (diff)
downloaddrminfo-bf13f4a8b4f78702f5a3d8a4781e53a47e41f82c.tar.gz
fix meson detect, add ninja detect
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2d3c756..50c83a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-MESON := $(shell which meson 2>&1)
+MESON := $(shell which meson 2>/dev/null)
+NINJA := $(shell which ninja-build 2>/dev/null || which ninja 2>/dev/null)
ifneq ($(MESON),)
@@ -6,10 +7,10 @@ HOST := $(shell hostname -s)
BDIR := build-meson-$(HOST)
build: $(BDIR)/build.ninja
- ninja-build -C $(BDIR)
+ $(NINJA) -C $(BDIR)
install: build
- ninja-build -C $(BDIR) install
+ $(NNJA) -C $(BDIR) install
clean:
rm -rf $(BDIR)