$NetBSD: patch-aa,v 1.7 2004/05/24 10:16:52 kristerw Exp $ --- Imakefile.orig 1997-01-23 17:38:35.000000000 +0100 +++ Imakefile 2004-05-24 12:13:39.000000000 +0200 @@ -1,4 +1,4 @@ -XBILL_DIR = /var/lib/games/xbill/ +XBILL_DIR = $(PREFIX)/share/xbill/ XCOMM XBILL_DIR = $(HOME)/.xbill/ XCOMM Which widget set? Motif looks slightly better; Athena is free. @@ -10,7 +10,7 @@ XCOMM the statement below and insert the correct path. XCOMM Make sure xpm.h can be referenced as -XPMINC = -I$(HOME)/include +XCOMM XPMINC = -I$(HOME)/include XPMLIB = -lXpm XCOMM You shouldn't have to change anything below this line. @@ -18,12 +18,10 @@ XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\" INCLUDES = -I. $(XPMINC) -CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS) -CCFLAGS = $(ALLDEFINES) -Wall -g -CXX = g++ $(CCFLAGS) CCC = $(CXX) CC = $(CXX) +CCLINK = $(CXXLINK) #ifdef Use_Motif WIDGET = motif @@ -35,7 +33,7 @@ #endif LOCAL_LIBRARIES = $(WIDGETLIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -DEFINES = -D$(WIDGET) +DEFINES = -D$(WIDGET) $(XBILL_DEF) TARGET = xbill @@ -136,6 +134,9 @@ ComplexProgramTarget($(TARGET)) -InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777) +install:: + mkdir -p $(XBILL_DIR) + ${INSTALL} -c -s -m 2755 -g games xbill $(PREFIX)/bin + InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps) InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)