From 21859a40e2594253908043188983184c2e527f61 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 28 Dec 2016 17:41:24 +0000 Subject: [PATCH] Makefile: Add some $(PLAY) This helps when this Makefile is included from elsewhere --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 05ba8b3..c402fe3 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ AUTO_INCS = funcs.scad utils.scad sealing-box.scad default: autoincs scads -$(shell set -xe; ./commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) +$(shell set -xe; $(PLAY)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) autoincs: $(AUTO_INCS) scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) @@ -134,7 +134,7 @@ FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \ filamentspool-number-n$n.dxf) $(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \ - ./toplevel-find $f))): $(FILAMENTSPOOL_DXFS) + $(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS) filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS) -- 2.30.2