restore no-auto-setup for in-place SVN install

svn: r2795

src/Makefile.in

@@ -17,7 +17,7 @@ mred3m-stub: @MAKE_MRED3M@
 
 install:
 	$(MAKE) install-normal
-	$(MAKE) setup-plt
+	$(MAKE) finish-stub
 
 install-normal:
 	if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
@@ -30,14 +30,16 @@ copytree-stub: @MAKE_COPYTREE@
 
 mredinstall-stub: @MAKE_MREDINSTALL@
 
+finish-stub: @MAKE_FINISH@
+
 setup-plt:
-	$(prefix)/bin/mzscheme -qM setup
+	$(prefix)/bin/mzscheme -mvqM setup
 
 install-3m:
 	$(MAKE) install-normal
 	$(MAKE) mzinstall3m
 	$(MAKE) mredinstall3m-stub
-	$(MAKE) setup-plt
+	$(MAKE) finish-stub
 
 mredinstall3m-stub: @MAKE_MREDINSTALL3M@
 
@@ -80,10 +82,10 @@ srcdir = @srcdir@
 prefix = @prefix@
 
 copy-finish:
-	cd $(prefix); ./install
+	$(MAKE) setup-plt
 
 inplace-finish:
-	if [ ! -d $(srcdir)/../collects/repos-time-stamp ] ; then cd $(prefix); ./install ; fi
+	if [ ! -d $(srcdir)/../collects/repos-time-stamp ] ; then $(MAKE) setup-plt ; fi
 	if [ -d $(srcdir)/../collects/repos-time-stamp ] ; then cat $(srcdir)/mzscheme/imsg.txt ; fi
 
 copytree:

src/README

@@ -147,8 +147,9 @@ the Unix instructions below, but note the following:
     the directory plt/bin/mzscheme. For a --prefix, build, the rest of
     the plt tree is also copied to the target directory.
 
-    In addition, this step runs the plt/install script, which updates
-    script paths and builds .zo files.
+    Excep for an in-place build from the Subversion archive (see step
+    4), this step also compiles ".zo" bytecode files for installed
+    Scheme source.
 
     If the installation fails because the target directory cannot be
     created, or because the target directory is not the one you
@@ -162,17 +163,19 @@ the Unix instructions below, but note the following:
     versions of the dynamic libraries in plt/lib.
 
  4. ONLY Subversion users with in-place builds: the `make install'
-    step does not run plt/install for an in-place build, because old
-    .zo files typically need to be deleted, first. After an initial
-    in-place build, manually run ./install in the plt directory. For
-    later builds, manually run plt/bin/setup-plt.
+    step does not automatically build ".zo" files. After an initial
+    in-place install, run `make setup-plt'. For subsequent installs
+    within the same Subversion checkout, you can run either `make
+    setup-plt' or `plt/bin/setup-plt'.
 
 After an "in-place" install without Subversion, the plt/src directory
 is no longer needed, and it can be safely deleted. Build information
 is recorded in plt/lib/buildinfo.
 
-If you move the plt tree (for a build without dynamic libraries), run
-the script ./install in the relocated plt directory.
+You can safely move the plt tree for a build without dynamic
+libraries. However, "launcher" scripts and other local executables
+generated from PLT Scheme may fail after moving the tree (in which
+case you'll have to re-create them).
 
 OpenGL, Unix, and pthreads
 --------------------------
@@ -307,12 +310,13 @@ for "moving memory manager".
   path. Then, in a shell, change directories to plt\src\worksp\gc2 and
   run
 
-   ../../../mzscheme.exe -r make.ss
+   ..\..\..\mzscheme.exe -r make.ss
 
   The resulting MzScheme3m.exe and MrEd3m.exe will appear in the "plt"
   directory, along with DLLs libmzsch3mxxxxxxx.dll and
-  libmred3mxxxxxxx.dll. (There is no correspingd libmzgc3mxxxxxxx.dll.
-  Instead, it is merged with libmzsch3mxxxxxxx.dll.)
+  libmred3mxxxxxxx.dll in plt/lib. (There is no correspingd
+  libmzgc3mxxxxxxx.dll.  Instead, it is merged with
+  libmzsch3mxxxxxxx.dll.)
 
 Configuration Options
 ---------------------

src/mzscheme/configure.ac

@@ -123,6 +123,7 @@ fi
 
 if test "${prefix}" = "NONE" ; then
   prefix=`cd "${srcdir}/.." && pwd`
+  MAKE_FINISH=inplace-finish
 else
   # Check whether ${prefix} is redundant, because
   # $prefix/src is $srcdir.
@@ -139,6 +140,7 @@ else
     echo "---->   ${prefix}/man/..."
     echo "---->   ${prefix}/notes/..."
     MAKE_COPYTREE=copytree
+    MAKE_FINISH=copy-finish
   fi
 fi
 
@@ -1107,6 +1109,7 @@ AC_SUBST(MAKE_MREDINSTALL)
 AC_SUBST(MAKE_MREDINSTALL3M)
 AC_SUBST(MAKE_WBUILD)
 AC_SUBST(MAKE_COPYTREE)
+AC_SUBST(MAKE_FINISH)
 
 AC_SUBST(WXPRECOMP)
 AC_SUBST(USE_WXPRECOMP)

src/mzscheme/imsg.txt

@@ -0,0 +1,4 @@
+
+  -----------------------------------------------------------
+  >> `make setup-plt' or run `plt/bin/setup-plt' to finish <<
+  -----------------------------------------------------------