29 lines
958 B
Text
29 lines
958 B
Text
$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:58 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${X11BASE}/lib
|
|
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)
|
|
|