--- Makefile.orig	Sun Nov 12 10:55:43 2000
+++ Makefile	Mon Nov 13 03:26:41 2000
@@ -307,2 +307,3 @@
 #CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
 
@@ -1589,24 +1590,24 @@
 $(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)/$(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)
 
@@ -1617,24 +1618,24 @@
 $(MANSUBDIR)/$(EXNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
 
 $(MANSUBDIR)/$(VIEWNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
 
 $(MANSUBDIR)/$(GVIMNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
 
 $(MANSUBDIR)/$(GVIEWNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
 
 $(MANSUBDIR)/$(RVIMNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
 
 $(MANSUBDIR)/$(RVIEWNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
 
 $(MANSUBDIR)/$(RGVIMNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
 
 $(MANSUBDIR)/$(RGVIEWNAME).1:
-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
 
