From 18b2b919dc266a8cc2e932c97489d5861daa3f68 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Tue, 22 Mar 2011 02:21:26 -0300
Subject: [PATCH] atben, atusb: always invoke KiCAD with absolute paths lest
 .pro be ignored

- atben/Makefile, atusb/Makefile (SCH, BRD): abstract path to .sch and
  .brd via variables
- atben/Makefile, atusb/Makefile (gerber, fab): pass absolute path to
  board file to pcbnew
- atben/Makefile, atusb/Makefile (gerber): put all options before the
  file name argument
---
 atben/Makefile | 19 +++++++++++--------
 atusb/Makefile | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/atben/Makefile b/atben/Makefile
index f455db2..46745f8 100644
--- a/atben/Makefile
+++ b/atben/Makefile
@@ -6,6 +6,9 @@ NAME = atben
 VERSION = 110314
 DIR = $(NAME)
 
+SCH=$(shell pwd)/$(NAME).sch
+BRD=$(shell pwd)/$(NAME).brd
+
 .PHONY:		all gen generate sch brd xpdf front back clean
 .PHONY:		gerber gerbv
 
@@ -14,14 +17,14 @@ all:
 		@exit 1
 
 gen generate:
-		eeschema --plot=ps `pwd`/$(NAME).sch
+		eeschema --plot=ps $(SCH)
 		# need scripts
 
 sch:
-		eeschema `pwd`/$(NAME).sch
+		eeschema $(SCH)
 
 brd:
-		pcbnew `pwd`/$(NAME).brd
+		pcbnew $(BRD)
 
 xpdf:
 		xpdf $(NAME).pdf
@@ -46,16 +49,16 @@ PCB_FILES = README-PCB $(NAME)-PCB_Edges.dxf $(NAME).drl \
 
 gerber:
 		pcbnew --plot=gerber --origin=aux \
-		  -l `pcbnew --list-layers $(NAME).brd | tr '\012' ,` \
-		  --fill-all-zones $(NAME).brd \
-		  --exclude-pcb-edge
+		  -l `pcbnew --list-layers $(BRD) | tr '\012' ,` \
+		  --fill-all-zones --exclude-pcb-edge \
+		  $(BRD)
 		$(GMERGE) $(NAME)-SilkS_Front.gto $(NAME)-Comments.gbr >_tmp \
 		  || { rm -rf _tmp; exit 1; }
 		mv _tmp $(NAME)-SilkS_Front.gto
 
 fab:		gerber
-		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd
-		pcbnew --drill --origin=aux $(NAME).brd
+		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(BRD)
+		pcbnew --drill --origin=aux $(BRD)
 		mkdir -p fab
 		tar Ccfz .. fab/$(NAME)-pcb-$(VERSION).tar.gz \
 		  $(PCB_FILES:%=$(DIR)/%)
diff --git a/atusb/Makefile b/atusb/Makefile
index cb176e4..2a8eb72 100644
--- a/atusb/Makefile
+++ b/atusb/Makefile
@@ -6,6 +6,9 @@ NAME = atusb
 VERSION = 110314
 DIR = $(NAME)
 
+SCH=$(shell pwd)/$(NAME).sch
+BRD=$(shell pwd)/$(NAME).brd
+
 .PHONY:		all gen generate sch brd xpdf front back clean
 .PHONY:		gerber gerbv fab
 
@@ -14,14 +17,14 @@ all:
 		@exit 1
 
 gen generate:
-		eeschema --plot=ps `pwd`/$(NAME).sch
+		eeschema --plot=ps $(SCH)
 		# need scripts
 
 sch:
-		eeschema `pwd`/$(NAME).sch
+		eeschema $(SCH)
 
 brd:
-		pcbnew `pwd`/$(NAME).brd
+		pcbnew $(BRD)
 
 xpdf:
 		xpdf $(NAME).pdf
@@ -63,16 +66,16 @@ PCB_FILES = README-PCB $(NAME)-PCB_Edges.dxf $(NAME).drl \
 
 gerber:
 		pcbnew --plot=gerber --origin=aux \
-		  -l `pcbnew --list-layers $(NAME).brd | tr '\012' ,` \
-		  --fill-all-zones $(NAME).brd \
-		  --exclude-pcb-edge
+		  -l `pcbnew --list-layers $(BRD) | tr '\012' ,` \
+		  --fill-all-zones --exclude-pcb-edge \
+		  $(BRD)
 		$(GMERGE) $(NAME)-SilkS_Front.gto $(NAME)-Comments.gbr >_tmp \
 		  || { rm -rf _tmp; exit 1; }
 		mv _tmp $(NAME)-SilkS_Front.gto
 
 fab:		gerber
-		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(NAME).brd
-		pcbnew --drill --origin=aux $(NAME).brd
+		pcbnew --plot=dxf --origin=aux -l PCB_Edges $(BRD)
+		pcbnew --drill --origin=aux $(BRD)
 		mkdir -p fab
 		tar Ccfz .. fab/$(NAME)-pcb-$(VERSION).tar.gz \
 		  $(PCB_FILES:%=$(DIR)/%)