diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 6eaf550fc..3c39fd137 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-01  Pavel Roskin  <proski@gnu.org>
+
+	* Make-mc.in: Make it possible to run "make install" before
+	"make all".  Use more Automake-compatible target names.
+
 2001-08-01  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* smbfs.c: Undefine VERSION to prevent warning. Comments fixes.
diff --git a/vfs/Make-mc.in b/vfs/Make-mc.in
index a5c50a62a..c9baa4e11 100644
--- a/vfs/Make-mc.in
+++ b/vfs/Make-mc.in
@@ -161,9 +161,13 @@ Makefile: $(srcdir)/Make-mc.in $(top_builddir)/config.status
 DISTVFS = Make-mc.in ChangeLog callback.h README README.fish \
 	$(VFSSRCS) $(VFSHDRS)
 
-all: @LIBVFS@ @mcserv@
+all: all-recursive all-local
+
+all-recursive:
 	cd extfs && $(MAKE) all
 
+all-local: @LIBVFS@ @mcserv@
+
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
 
@@ -193,7 +197,9 @@ mcserv: mcserv.o tcputil.o mad.o
 # Commands to build standalone version (.so)
 #
 
-VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so tar.so names.so container.so extfs.so util-alone.so util.sor utilunix.sor sfs.so fish.so direntry.so cpio.so
+VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so \
+	tar.so names.so container.so extfs.so util-alone.so util.sor \
+	utilunix.sor sfs.so fish.so direntry.so cpio.so
 
 %.sor:	../src/%.c
 	$(CC) -c -fpic $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@
@@ -234,13 +240,14 @@ distclean: clean
 	rm -f *~
 	rm -f Makefile
 
-install: install.extfs @MCSERV_INSTALL_TRUE@ install_mcserv
+install: all-local install-local install-recursive
 
-install_mcserv:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv
+install-local:
+@MCSERV_INSTALL_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir)
+@MCSERV_INSTALL_TRUE@	$(INSTALL_PROGRAM) mcserv \
+@MCSERV_INSTALL_TRUE@	  $(DESTDIR)$(bindir)/$(binprefix)mcserv
 
-install.extfs:
+install-recursive:
 	cd extfs && $(MAKE) install
 
 uninstall: