Call it `saved-objects', not `obj', to avoid confusing BSD make.

diff --git a/src/Makefile.in b/src/Makefile.in
index 76bbb1920e206574ff82a127de28bbe784ba1b8f..ac97216d401ae8e887bbabda5c857f3a44d40364 100644 (file)
--- 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 c36b30538ab00d6268c0ced37a60295649b38b1e..b91aa318b0da50439f9396460ffce75e3774fccb 100644 (file)
--- 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