From a3f09a04518ce9ed7cb93719149f75c36ad02856 Mon Sep 17 00:00:00 2001 From: Alexey Yerin Date: Wed, 4 Oct 2023 20:58:37 +0300 Subject: Makefile: Update hare version -v parsing --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0038792..b48219b 100644 --- a/Makefile +++ b/Makefile @@ -41,12 +41,14 @@ uninstall4: rm -r "$(DESTDIR)$(THIRDPARTYDIR)/$$mod"; \ done +HAREPATH_CMD = hare version -v | awk 'harepath { gsub(/^\t/, ""); print }; /^HAREPATH/ { harepath = 1 }' | tr '\n' ':' + demo: - env HAREPATH="$(BINDINGS_DIR):$$(hare version -v | grep HAREPATH | cut -f2-)" \ + env HAREPATH="$(BINDINGS_DIR):$$($(HAREPATH_CMD))" \ hare build $$(pkg-config --libs-only-l --static gtk+-3.0) -lbsd -o demo cmd/demo demo4: - env HAREPATH="$(BINDINGS_DIR):$$(hare version -v | grep HAREPATH | cut -f2-)" \ + env HAREPATH="$(BINDINGS_DIR):$$($(HAREPATH_CMD))" \ hare build $$(pkg-config --libs-only-l --static gtk4) -lepoxy -lXi -lxkbcommon -lwayland-client -lwayland-egl -lXfixes -lXcursor -lXdamage -lXrandr -lXinerama -lcairo-script-interpreter -lbsd -o demo4 cmd/demo4 clean: -- cgit 1.3.0-6-gf8a5