Forward-port fix for #2237 from 2.8 branch.

doc/CHANGES.txt

@@ -12,6 +12,9 @@ Zope Changes
 
       - Collector #2213: Can't edit "old" ZopePageTemplate instances.
 
+      - Collector #2237: 'make' doesn't tell you to run 'make inplace'
+        before running 'make instance'.
+
       - Collector #2235: A number of ZCatalog methods were doing boolean
         evaluation of objects that implemented __len__ instead of checking
         them against None. Replaced a number of "if not obj" with

inst/Makefile.in

@@ -38,9 +38,9 @@ MKDIR=mkdir -p
 # default:     The default step (invoked when make is called without a target)
 default: build
 	@echo
-	@echo Zope built.  Next, do \'make install\' \(or \'make instance\'
-	@echo to run a Zope instance directly from the build directory\).
-	@echo
+	@echo Zope built.  Next, do \'make install\' \(or \'make inplace\',
+	@echo followed by \'make instance\' to run a Zope instance directly
+	@echo from the build directory\).
 
 # build:       Do whatever 'setup.py build' implies
 build: