From edb48c6bb9b2c3c2ce448313d2433694dc3198df Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 22 Nov 2010 02:11:54 +0000
Subject: [PATCH] layout/Makefile: break out LAYOUTOPTS_E and LAYOUTOPTS_BS

---
 layout/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/layout/Makefile b/layout/Makefile
index 601bca2..63b87e5 100644
--- a/layout/Makefile
+++ b/layout/Makefile
@@ -17,7 +17,11 @@ LAYOUTOPTS_COLOUR= -CA=\#f00 -CC=\#dd0 -CrpLD=\#00f -Ci=\#c0c
 LAYOUTOPTS_MB=	-E'=*aRsclDmno' -E'=5RNLDA' -E'*~=5rCdsml' \
 		$(LAYOUTOPTS_PS)
 LAYOUTOPTS_M=	-l$* $(LAYOUTOPTS_MB)
-LAYOUTOPTS_B=	-S2.828 $(LAYOUTOPTS_MB) -Cl=-
+LAYOUTOPTS_BS=	-S2.828
+LAYOUTOPTS_B=	$(LAYOUTOPTS_BS) $(LAYOUTOPTS_MB) -Cl=-
+LAYOUTOPTS_E=	 -E'=*aRsclMno' \
+		-e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' \
+		-e'[sp]=*rm'
 
 PLANUI_PSDPI= 72
 PLANUI_WIDTH= 595
@@ -174,9 +178,7 @@ testphys-m%.ps:	testphys.d4 layout
 		$(LAYOUT) <$< $(LAYOUTOPTS_M) $o
 
 ours-e%.ps:	ours.d4 layout
-		$(LAYOUT) <$< -l$* -E'=*aRsclMno' \
-			-e'=5RN' -E'*~=5rsm' -e'p~=5r' -e'*=*l' \
-			-e'[sp]=*rm' $(LAYOUTOPTS_COLOUR) $o
+		$(LAYOUT) <$< -l$* $(LAYOUTOPTS_E) $(LAYOUTOPTS_COLOUR) $o
 
 ours-p%.ps:	ours.d4 layout
 		$(LAYOUT) <$< -l$$(printf %s "$*" | sed -e 's/-/ -P/') \
-- 
2.30.2