summaryrefslogtreecommitdiff
path: root/editors/vim/patches/patch-af
blob: ae83bd6a790e591f848af2495a4d72e1552fc964 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
$NetBSD: patch-af,v 1.6 1999/11/25 20:20:33 tron Exp $

--- Makefile.orig	Sun Sep 19 13:27:33 1999
+++ Makefile	Thu Nov 25 21:03:25 1999
@@ -721,7 +721,7 @@
 ### might not work when they are changed!)
 VIMDIR = /vim
 VIMRTDIR = /vim55
-HELPSUBDIR = /doc
+HELPSUBDIR = /../../doc/vim
 SYNSUBDIR = /syntax
 MACROSUBDIR = /macros
 TOOLSSUBDIR = /tools
@@ -902,23 +902,26 @@
 ### Athena Widget GUI interface.
 ### Use Xaw3d to make the menus look a little bit nicer
 #XAW_LIB = -lXaw3d
-XAW_LIB = -lXaw
+#XAW_LIB = -lXaw
 
 ### When using Xaw3d, uncomment/comment the following lines to also get the
 ### scrollbars from Xaw3d.
-#ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
-#ATHENA_OBJ	= gui.o gui_athena.o gui_x11.o pty.o gui_at_fs.o
-#ATHENA_DEFS	= -DUSE_GUI_ATHENA $(NARROW_PROTO) \
-#		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
-#		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.if ($(XAW_LIB) != "Xaw")
+ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
+ATHENA_OBJ	= gui.o gui_athena.o gui_x11.o pty.o gui_at_fs.o
+ATHENA_DEFS	= -DUSE_GUI_ATHENA $(NARROW_PROTO) \
+		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.else
 ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_at_sb.c gui_at_fs.c
 ATHENA_OBJ	= gui.o gui_athena.o gui_x11.o pty.o gui_at_sb.o gui_at_fs.o
 ATHENA_DEFS	= -DUSE_GUI_ATHENA $(NARROW_PROTO)
+.endif
 
 ATHENA_INCL	= gui.h
 ATHENA_IPATH	= -I$(GUI_INC_LOC)
 ATHENA_LIBS_DIR = -L$(GUI_LIB_LOC)
-ATHENA_LIBS1	= $(XAW_LIB)
+ATHENA_LIBS1	= -l$(XAW_LIB)
 ATHENA_LIBS2	= -lXt
 ATHENA_TARGETS	= $(BINDIR)/$(GVIMTARGET) \
 			$(BINDIR)/$(GVIEWTARGET) \
@@ -1330,6 +1333,7 @@
 
 # install the help files; first adjust the contents for the location
 installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC)
+	ln -s ${HELPSUBLOC} ${VIMRTLOC}/doc
 	@echo generating $(MANSUBDIR)/$(VIMNAME).1
 	@sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
 		-e s+$(VIMLOC)/doc+$(HELPENDLOC)+ \