From d94cad2281808e9ec87e6274d2d83cb1997fb679 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Mon, 7 Oct 2013 20:52:57 +0000
Subject: [PATCH] Call it `saved-objects', not `obj', to avoid confusing BSD
 make.

---
 src/Makefile.in       | 12 ++++++------
 src/Makefile.tools.in | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 76bbb1920..ac97216d4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -184,8 +184,8 @@ lib/all.com: microcode/scheme
 .PHONY: save
 save:
 	@echo 'Saving objects...'
-	@rm -rf obj && \
-	mkdir obj && \
+	@rm -rf saved-objects && \
+	mkdir saved-objects && \
 	( \
 	  find $(SUBDIRS) -type f \
 	    \( \
@@ -199,14 +199,14 @@ save:
 	      -false \
 	    \) \
 	    -print0 \
-	  | pax -rw -pe -l -v -d -0 obj/. \
-	) || { rm -rf obj; exit 1; }
+	  | pax -rw -pe -l -v -d -0 saved-objects/. \
+	) || { rm -rf saved-objects; exit 1; }
 
 .PHONY: restore
 restore:
 	@echo 'Restoring objects...'
-	@if ! test -d obj; then exit 1; fi && \
-	(cd obj && pax -rw -pe -v . ../../.)
+	@if ! test -d saved-objects; then exit 1; fi && \
+	(cd saved-objects && pax -rw -pe -v . ../../.)
 
 ### Stuff we build with the tools compiler necessarily from scratch.
 
diff --git a/src/Makefile.tools.in b/src/Makefile.tools.in
index c36b30538..b91aa318b 100644
--- a/src/Makefile.tools.in
+++ b/src/Makefile.tools.in
@@ -80,15 +80,15 @@ all: tools/syntaxer.com
 .PHONY: clean
 clean:
 	@for d in $(SUBDIRS); do (cd $$d && sh Clean.sh clean); done
-	-rm -rf tools/obj
+	-rm -rf tools/saved-objects
 	-rm -f tools/compiler.com
 	-rm -f tools/syntaxer.com
 
 .PHONY: save
 save:
 	@echo 'Saving tools objects...'
-	@rm -rf tools/obj && \
-	mkdir tools/obj && \
+	@rm -rf tools/saved-objects && \
+	mkdir tools/saved-objects && \
 	( \
 	  find $(SUBDIRS) -type f \
 	    \( \
@@ -102,14 +102,14 @@ save:
 	      -false \
 	    \) \
 	    -print0 \
-	  | pax -rw -pe -l -v -d -0 tools/obj/. \
-	) || { rm -rf tools/obj; exit 1; }
+	  | pax -rw -pe -l -v -d -0 tools/saved-objects/. \
+	) || { rm -rf tools/saved-objects; exit 1; }
 
 .PHONY: restore
 restore:
-	@echo 'Restoring tools objects...'
-	@if ! test -d tools/obj; then exit 1; fi && \
-	(cd tools/obj && pax -rw -pe -v . ../../.)
+	@echo 'Restoring tools saved-objectsects...'
+	@if ! test -d tools/saved-objects; then exit 1; fi && \
+	(cd tools/saved-objects && pax -rw -pe -v . ../../.)
 
 tools/compiler.com: tools/syntaxer.com
 tools/compiler.com: compile-cross-compiler
-- 
2.25.1