From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Jan 2015 22:38:36 +0000 (+0000)
Subject: Makefile: load base .slic3r file too
X-Git-Tag: filamentspool-v2-release~216
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=b8d78b2539de8d266e371a4b9bc19612fe087093

Makefile: load base .slic3r file too
---

diff --git a/Makefile b/Makefile
index 0e94734..70905bc 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,13 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 		@rm .$@.d.tmp
 	        mv -f $*.tmp.stl $@
 
+AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
+
 %.gcode:	%.stl $(CONFIG)
 		$(SLIC3R) --load $(CONFIG) \
-			--ignore-nonexistent-config --load $*.slic3r \
+			--ignore-nonexistent-config \
+			--load $(call AUTOBASE,$*).slic3r \
+			--load $*.slic3r \
 			--output $@.tmp $<
 	        @mv -f $@.tmp $@