--- Makefile.old	Wed Jan 19 09:43:24 2005
+++ Makefile	Wed Jan 19 09:43:41 2005
@@ -79,10 +79,9 @@
 # Destinations for installation. $(PRESERVEDIR) is used for recovery files.
 # It will get mode 1777.
 #
-PREFIX		= /usr/local
 BINDIR		= $(PREFIX)/bin
 LIBEXECDIR	= $(PREFIX)/libexec
-MANDIR		= $(PREFIX)/share/man
+MANDIR		= $(PREFIX)/man
 PRESERVEDIR	= /var/preserve
 
 #
@@ -94,7 +93,7 @@
 #
 # A BSD-like install program. GNU install will fit well here, too.
 #
-INSTALL		= /usr/ucb/install
+INSTALL		= /usr/bin/install
 
 #
 # Compiler and linker flags.
@@ -292,13 +291,6 @@
 # install in standard place
 
 install-man:
-	test -d $(DESTDIR)$(PREFIX) || mkdir -p $(DESTDIR)$(PREFIX)
-	test -d $(DESTDIR)$(MANDIR) || mkdir -p $(DESTDIR)$(MANDIR)
-	test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1
-	rm -f $(DESTDIR)$(MANDIR)/man1/ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1 \
-		$(DESTDIR)$(MANDIR)/man1/vedit.1 \
-		$(DESTDIR)$(MANDIR)/man1/vi.1 \
-		$(DESTDIR)$(MANDIR)/man1/view.1
 	$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1
 	$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1
 	ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1
@@ -306,10 +298,6 @@
 	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1
 
 install: all install-man
-	rm -f $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/edit \
-		$(DESTDIR)$(BINDIR)/vedit $(DESTDIR)$(BINDIR)/vi \
-		$(DESTDIR)$(BINDIR)/view
-	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
 # special provisions for sticky install
 	if test -f $(DESTDIR)$(BINDIR)/ex; \
 	then	test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \
@@ -319,7 +307,6 @@
 		rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \
 	fi
 	$(INSTALL) -c $(STRIP) -m 1755 ex $(DESTDIR)$(BINDIR)/ex
-	test -d $(DESTDIR)$(LIBEXECDIR) || mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL) -c $(STRIP) exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover
 	$(INSTALL) -c $(STRIP) expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve
 	ln -s ex $(DESTDIR)$(BINDIR)/edit