1998-11-24 19:47:59 +00:00
|
|
|
--- src/makjunix.mak.orig Tue Nov 17 20:55:43 1998
|
|
|
|
|
+++ src/makjunix.mak Tue Nov 17 21:07:34 1998
|
|
|
|
|
@@ -55,14 +55,14 @@
|
1998-10-20 15:52:55 +00:00
|
|
|
### 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
|
1998-11-24 19:47:59 +00:00
|
|
|
###
|
|
|
|
|
-#X11LIBDIR = /usr/X11R6/lib
|
|
|
|
|
-#X11INCDIR = /usr/X11R6/include
|
1998-10-20 15:52:55 +00:00
|
|
|
+X11LIBDIR = /usr/X11R6/lib
|
|
|
|
|
+X11INCDIR = /usr/X11R6/include
|
1998-11-24 19:47:59 +00:00
|
|
|
###
|
|
|
|
|
#X11LIBDIR = /usr/X386/lib
|
|
|
|
|
#X11INCDIR = /usr/X386/include
|
|
|
|
|
@@ -72,13 +72,13 @@
|
|
|
|
|
|
|
|
|
|
|
1998-10-20 15:52:55 +00:00
|
|
|
### 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
|
1998-11-24 19:47:59 +00:00
|
|
|
@@ -100,7 +100,7 @@
|
1998-10-20 15:52:55 +00:00
|
|
|
|
|
|
|
|
MANFILE = ../doc/vim.1
|
|
|
|
|
|
|
|
|
|
-HELPFILE = ../doc/vim.hlp
|
|
|
|
|
+HELPFILE = ../doc.j/vim.hlp
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# PART 2: various choices
|
1998-11-24 19:47:59 +00:00
|
|
|
@@ -168,7 +168,8 @@
|
1998-10-20 15:52:55 +00:00
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
#
|
1998-11-24 19:47:59 +00:00
|
|
|
@@ -447,11 +448,11 @@
|
1998-10-20 15:52:55 +00:00
|
|
|
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
|
1998-11-24 19:47:59 +00:00
|
|
|
@@ -599,7 +600,7 @@
|
1998-10-20 15:52:55 +00:00
|
|
|
$(CC) $(CFLAGS) fepbow.c
|
|
|
|
|
|
|
|
|
|
fepcanna.o: fepcanna.c
|
|
|
|
|
- $(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
|
1998-11-24 19:47:59 +00:00
|
|
|
+ $(CC) $(CFLAGS) -I${PREFIX}/include fepcanna.c
|
1998-10-20 15:52:55 +00:00
|
|
|
|
|
|
|
|
feponew.o: feponew.c
|
|
|
|
|
$(CC) $(CFLAGS) feponew.c
|
