summaryrefslogtreecommitdiff
path: root/x11/xteddy/patches/patch-aa
blob: ae1789c3dc74e2e674b791bc6aaa26e78d2a1532 (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
$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $

--- Makefile.in.orig	Thu Oct 29 03:01:17 1998
+++ Makefile.in
@@ -70,11 +70,11 @@
 xteddy_SOURCES = xteddy.c 
 HTML_DOC = html/xteddy.html html/xteddy_info.html \
            html/images/noise.jpg html/images/xteddy.gif html/images/xteddy.xbm
-xteddy_LDADD = -L/usr/X11R6/lib
+xteddy_LDADD = -L${BUILDLINK_X11_DIR}
 LIBS = -lX11 -lXext -lXpm
 man_MANS = xteddy.1
 
-pixmapdir = $(prefix)/include/X11
+pixmapdir = $(prefix)/share/xteddy
 
 pixmap_DATA = pixmaps/xteddy_bw.xbm      \
               pixmaps/xteddy_color.xpm   \
@@ -108,8 +108,8 @@
 xteddy_DEPENDENCIES = 
 xteddy_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) ${X_CFLAGS}
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ${X_LIBS} ${X_EXTRA_LIBS} ${X_PRE_LIBS}
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)