Merge branch 'v2.3' into v2.4

src/lib/Makefile

@@ -179,19 +179,19 @@ ifdef PLUMED_LIBSUFFIX
 	@echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 endif
 ifndef program_name
-	$(error "it seems Makefile.conf does not defined program_name - please configure again!")
+	$(error "it seems Makefile.conf does not define program_name - please configure again!")
 endif
 ifndef bindir
-	$(error "it seems Makefile.conf does not defined bindir - please configure again!")
+	$(error "it seems Makefile.conf does not define bindir - please configure again!")
 endif
 ifndef libdir
-	$(error "it seems Makefile.conf does not defined libdir - please configure again!")
+	$(error "it seems Makefile.conf does not define libdir - please configure again!")
 endif
 ifndef includedir
-	$(error "it seems Makefile.conf does not defined includedir - please configure again!")
+	$(error "it seems Makefile.conf does not define includedir - please configure again!")
 endif
 ifndef htmldir
-	$(error "it seems Makefile.conf does not defined htmldir - please configure again!")
+	$(error "it seems Makefile.conf does not define htmldir - please configure again!")
 endif
 	cd ../config ; $(MAKE)
 # in principle we should uninstall before install
@@ -310,19 +310,21 @@ endif
 	@if test -d ../../vim/help ; then echo "From vim, you can use :set syntax=$(program_name) to enable it" ; fi
 ifeq ($(program_can_run),no)
 	@echo "WARNING: $(program_name) executable will not run on this machine"
-	@echo "WARNING: to patch an MD code use 'plumed-patch'"
-	@echo "WARNING: to verify configuration use 'plumed-config'"
-	@echo "WARNING: a few other command line tools are avalable as $(libdir)/$(program_name)/plumed-*"
+	@echo "WARNING: This is normal if you are cross compiling."
+	@echo "WARNING: - to patch an MD code use '$(program_name)-patch'"
+	@echo "WARNING: - to verify configuration use '$(program_name)-config'"
+	@echo "WARNING: - a few other command line tools are avalable as $(libdir)/$(program_name)/plumed-*"
 else ifeq ($(program_can_run_mpi),no)
 	@echo "WARNING: $(program_name) executable will not run on this machine"
 	@echo "WARNING: unless you invoke it as '$(program_name) --no-mpi'"
-	@echo "WARNING: to patch an MD code now use '$(program_name) --no-mpi patch'"
-	@echo "WARNING: (notice that MPI will be available anyway in the patched code)"
-	@echo "WARNING: all command line tools are available as '$(program_name) --no-mpi name-of-the-tool'"
-	@echo "WARNING: e.g. '$(program_name) --no-mpi driver'"
+	@echo "WARNING: This is normal if this is the login node of a cluster."
+	@echo "WARNING: - to patch an MD code now use '$(program_name) --no-mpi patch'"
+	@echo "WARNING:   (notice that MPI will be available anyway in the patched code)"
+	@echo "WARNING: - all command line tools are available as '$(program_name) --no-mpi name-of-the-tool'"
+	@echo "WARNING:   e.g. '$(program_name) --no-mpi driver'"
+	@echo "WARNING:   (MPI will be disabled in this case)"
 endif
 
-
 uninstall:
 	@echo WARNING
 	@echo I will remove the following files now