blob: 291fd523eb462dfd7db5185d17c84350a4d53962 (
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
|
$NetBSD: patch-ad,v 1.8 2005/10/17 06:49:34 martti Exp $
--- src/Makefile.orig 2005-10-15 14:52:15.000000000 +0300
+++ src/Makefile 2005-10-17 04:16:59.000000000 +0300
@@ -1076,26 +1076,31 @@
### Athena GUI
### 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_beval.c gui_at_fs.c
-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-# objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
-#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.if defined(XAW_LIB)
+.if (${XAW_LIB} != "Xaw")
+ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
+ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+ objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
+ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
+ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.else
ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
gui_at_sb.c gui_at_fs.c
ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
objects/pty.o objects/gui_beval.o \
objects/gui_at_sb.o objects/gui_at_fs.o
ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
+.endif # Xaw
+.endif # defined(XAW_LIB)
ATHENA_IPATH = $(GUI_INC_LOC)
ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-ATHENA_LIBS1 = $(XAW_LIB)
+ATHENA_LIBS1 = $(LIBXAW)
ATHENA_LIBS2 = -lXt
ATHENA_INSTALL = install_normal
ATHENA_TARGETS = installglinks
@@ -1788,7 +1793,7 @@
-chmod $(FILEMOD) $(DEST_TOOLS)/*
# replace the path in some tools
perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+ awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
|