--- src/makjunix.mak.orig	Sat Jun 30 18:14:16 2001
+++ src/makjunix.mak	Sat Jun 30 18:16:14 2001
@@ -61,8 +61,8 @@
 #X11LIBDIR = /usr/lib/X11R5
 #X11INCDIR = /usr/include/X11R5
 ###
-#X11LIBDIR = /usr/X11R6/lib
-#X11INCDIR = /usr/X11R6/include
+X11LIBDIR = /usr/X11R6/lib
+X11INCDIR = /usr/X11R6/include
 ###
 #X11LIBDIR = /usr/X386/lib
 #X11INCDIR = /usr/X386/include
@@ -72,13 +72,13 @@
 
 
 ### Prefix for location of files
-PREFIX = /usr/local
+PREFIX?= /usr/local
 
 ### Location of binary
 BINLOC = $(PREFIX)/bin
 
 ### Name of target
-TARGET = vim
+TARGET = jvim3
 
 ### Location of man page
 MANLOC = $(PREFIX)/man/man1
@@ -100,7 +100,7 @@
 
 MANFILE = ../doc/vim.1
 
-HELPFILE = ../doc/vim.hlp
+HELPFILE = ../doc.j/vim.hlp
 
 #
 # PART 2: various choices
@@ -168,7 +168,8 @@
 
 DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \
 		-DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \
-		-DVIM_HLP=\"$(HELPLOC)/vim.hlp\" \
+		-DVIM_HLP=\"$(HELPLOC)/jvim3.hlp\" \
+		-DDEFVIMRC_FILE=\"$(PREFIX)/etc/jvim3rc\" \
 		-DKANJI -DUCODE -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_TAGEX -DUSE_OPT $(FEPOPT)
 
 #
@@ -460,11 +461,11 @@
 	chmod $(BINMOD) $(BINLOC)/$(TARGET)
 	$(STRIP) $(BINLOC)/$(TARGET)
 	-mkdir $(MANLOC)
-	cp $(MANFILE) $(MANLOC)
-	chmod $(MANMOD) $(MANLOC)/vim.1
+	cp $(MANFILE) $(MANLOC)/jvim3.1
+	chmod $(MANMOD) $(MANLOC)/jvim3.1
 	-mkdir $(HELPLOC)
-	cp $(HELPFILE) $(HELPLOC)
-	chmod $(HELPMOD) $(HELPLOC)/vim.hlp
+	cp $(HELPFILE) $(HELPLOC)/jvim3.hlp
+	chmod $(HELPMOD) $(HELPLOC)/jvim3.hlp
 
 clean:
 	-rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
@@ -619,7 +620,7 @@
 	$(CC) $(CFLAGS) fepbow.c
 
 fepcanna.o: fepcanna.c
-	$(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
+	$(CC) $(CFLAGS) -I${PREFIX}/include fepcanna.c
 
 feponew.o: feponew.c
 	$(CC) $(CFLAGS) feponew.c