From 37c6873262e6fecbc787d4d78dc2291309db7b64 Mon Sep 17 00:00:00 2001 From: dybvig Date: Mon, 2 May 2016 22:21:13 -0400 Subject: [PATCH] workarea now copies the zlib directory to the work area so changes during configure and make don't affect the original. correspondingly, the distclean target in the generated root Makefile no longer runs distclean in zlib. original commit: e7436f657a54a2871519e887e485f53fbed2eded --- makefiles/Makefile.in | 1 - workarea | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/makefiles/Makefile.in b/makefiles/Makefile.in index 8160d23ba5..85c73a7db3 100644 --- a/makefiles/Makefile.in +++ b/makefiles/Makefile.in @@ -32,6 +32,5 @@ clean: distclean: rm -rf $(workarea) - (cd zlib ; make distclean) rm -f Makefile rm -f Make.out diff --git a/workarea b/workarea index b5289f5f61..5a4048dcd9 100755 --- a/workarea +++ b/workarea @@ -128,13 +128,20 @@ workdir $W/mats (cd $W/mats; workln ../../mats/Mf-base Mf-base) (cd $W/mats; workln ../../mats/Mf-exobj Mf-exobj) -for dir in `echo zlib examples unicode` ; do +for dir in `echo examples unicode` ; do workdir $W/$dir for file in `(cd $dir ; echo *)` ; do (cd $W/$dir ; workln ../../$dir/$file $file) done done +# deep copy submodules where builds occur so changes don't propagate through symlinks +for dir in `echo zlib` ; do + if [ ! -e $W/$dir ] ; then + /bin/cp -R $dir $W/$dir + fi +done + workdir $W/boot workdir $W/boot/$M (cd $W/boot/$M; workln ../../../boot/$M/scheme.h scheme.h)