--- src/makjunix.mak.orig	Fri Sep 11 11:00:13 1998
+++ src/makjunix.mak	Tue Sep 15 16:26:30 1998
@@ -55,20 +55,24 @@
 ### root directory for X11 files (unless overruled in hardware-dependend part)
 ### Unfortunately there is no standard for these, everybody puts them
 ### somewhere else
-X11LIBDIR = /usr/openwin/lib
-X11INCDIR = /usr/openwin/include
+#X11LIBDIR = /usr/openwin/lib
+#X11INCDIR = /usr/openwin/include
 ### for some hpux systems:
 #X11LIBDIR = /usr/lib/X11R5
 #X11INCDIR = /usr/include/X11R5
 
+### for FreeBSD with XFree86
+X11LIBDIR = /usr/X11R6/lib
+X11INCDIR = /usr/X11R6/include
+
 ### 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
@@ -90,7 +94,7 @@
 
 MANFILE = ../doc/vim.1
 
-HELPFILE = ../doc/vim.hlp
+HELPFILE = ../doc.j/vim.hlp
 
 #
 # PART 2: various choices
@@ -158,7 +162,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 -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT)
 
 #
@@ -430,11 +435,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
@@ -582,7 +587,7 @@
 	$(CC) $(CFLAGS) fepbow.c
 
 fepcanna.o: fepcanna.c
-	$(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
+	$(CC) $(CFLAGS) -I/usr/local/canna/include -I${PREFIX}/include fepcanna.c
 
 feponew.o: feponew.c
 	$(CC) $(CFLAGS) feponew.c