Update Makefile again to use the GDSes directly
diff --git a/Makefile b/Makefile
index 7cb1d80..7a1745d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,7 @@
 	@echo "###############################################"
 	@echo "Generating Caravel GDS (sources are in the 'gds' directory)"
 	@sleep 1
-	@cd mag && MAGTYPE=mag magic -rcfile ${PDK_ROOT}/sky130A/libs.tech/magic/current/sky130A.magicrc -noc -dnull mag2gds.tcl < /dev/null
-	mv mag/caravel_out.gds gds
+	@cd gds && MAGTYPE=mag magic -rcfile ${PDK_ROOT}/sky130A/libs.tech/magic/current/sky130A.magicrc -noc -dnull gen_caravel.tcl < /dev/null
 
 
 
@@ -36,7 +35,7 @@
 
 
 $(LARGE_FILES_GZ): %.gz: %
-	if ! [ $(suffix $<) == ".gz" ]; then\
+	@if ! [ $(suffix $<) == ".gz" ]; then\
 		gzip -n --best $< > /dev/null &&\
 		echo "$< -> $@";\
 	fi