--- Makefile.orig	Sun Nov  9 15:34:28 1997
+++ Makefile	Tue Nov 11 06:51:53 1997
@@ -249,6 +249,7 @@
 
 ### Extra configure arguments - just put anything here, just an example
 #CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
 
 ### For creating a plain Vim without any X11 related fancies use this one:
 ### (otherwise Vim configure will try to include xterm titlebar access)
@@ -1018,31 +1019,31 @@
 installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
 
 $(BINDIR)/$(EXTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+	#cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
 
 $(BINDIR)/$(VIEWTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+	#cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
 
 $(BINDIR)/$(GVIMTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
 
 $(BINDIR)/$(GEXTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(GEXTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GEXTARGET)
 
 $(BINDIR)/$(GVIEWTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
 
 $(BINDIR)/$(RVIMTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
 
 $(BINDIR)/$(RVIEWTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
 
 $(BINDIR)/$(RGVIMTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
 
 $(BINDIR)/$(RGVIEWTARGET):
-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
 
 uninstall:
 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX) $(BINDIR)/$(GVIMTARGET)