blob: 7bed8b1346d0eb55e822d835a0743ee5b5d94386 (
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
|
$NetBSD: patch-aa,v 1.4 2004/03/07 01:34:04 snj Exp $
--- Makefile.in.orig 2003-07-03 20:13:45.000000000 -0700
+++ Makefile.in 2004-03-06 17:27:16.000000000 -0800
@@ -15,20 +15,19 @@
DEFS=-DHAVE_CONFIG_H -Wall @HOSTDEF@
-LIBDIR=/usr/X11R6/lib
+LIBDIR=${X11BASE}/lib
INCDIR=.
-XINCDIR=/usr/X11R6/include
+XINCDIR=${X11BASE}/include
XLIB=-lXaw -lXmu
EXTENSIONLIB=-lXext
INCLUDES=-I$(INCDIR)
XINCLUDES=-I$(XINCDIR)
SPLIBS=@ADDLIBS@
-LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
+LIBS=-Wl,-R${LIBDIR} -L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
#CC=/compat/linux/usr/bin/gcc
-CC=@CC@
-CFLAGS=-O3 $(INCLUDES) $(DEFS)
-CFLAGSX=-O3 $(XINCLUDES) $(DEFS)
+CFLAGS+= $(INCLUDES) $(DEFS)
+CFLAGSX= $(CFLAGS) $(XINCLUDES)
LDFLAGS=-s
LINT=lint
@@ -38,8 +37,8 @@ RM=rm -f
INSTALL=install
INST_DIR=/usr/local/bin
-INST_XDIR=/usr/X11R6/bin
-INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
+INST_XDIR=${X11BASE}/bin
+INST_XRDIR=${X11BASE}/lib/X11/app-defaults
.c.o:
$(CC) -c $(CFLAGS) $*.c
|
