$NetBSD: patch-aa,v 1.3 2001/03/01 20:52:15 tron Exp $ --- Makefile.orig Mon Feb 26 22:56:48 2001 +++ Makefile @@ -32,31 +32,31 @@ include Makefile.win32 else -IROOT = /usr/local +IROOT = $(X11PREFIX) BINDIR = $(IROOT)/bin MANDIR = $(IROOT)/man/man1 # if you have perl set the path here, else just leave it alone -PERL = /usr/bin/perl +PERL = $(LOCALBASE)/bin/perl -LDLIBS = -ltk8.3 -ltcl8.3 -L/usr/X11R6/lib -lX11 -lm -ldl +LDLIBS = -ltk83 -ltcl83 -L$(X11BASE)/lib -lX11 -lm # use static libraries for debugging only #LDLIBS = dbglib/libtk8.3.a dbglib/libtcl8.3.a -lX11 -lm -ldl -L/usr/X11R6/lib -INCS += -I. -I/usr/X11R6/include +INCS += -I. -I$(X11BASE)/include -I$(LOCALBASE)/include # path to Tcl/Tk headers, if not properly installed #INCS += -I/usr/local/tcl/tcl8.0/generic -I/usr/local/tcl/tk8.0/generic # path to Tcl/Tk script library (Tk is usually in X11/lib/tk#.#) -DEFS += -DTK_LIBRARY_PATH=\"/usr/lib/tk8.3\" -DEFS += -DTCL_LIBRARY_PATH=\"/usr/lib/tcl8.3\" +DEFS += -DTK_LIBRARY_PATH=\"$(LOCALBASE)/lib/tk8.3\" +DEFS += -DTCL_LIBRARY_PATH=\"$(LOCALBASE)/lib/tcl8.3\" #WARN = -Wall -Wpointer-arith -Wnested-externs \ # -Werror -Wstrict-prototypes -Wmissing-prototypes WARN = -Wall -CC = gcc -CFLAGS = -pipe $(WARN) $(INCS) $(DEFS) -O +#CC = gcc +CFLAGS += $(WARN) $(INCS) $(DEFS) # ----- don't change anything below ------------------------------------------ @@ -81,7 +81,7 @@ test -d $(BINDIR) || mkdirhier $(BINDIR) test -d $(MANDIR) || mkdirhier $(MANDIR) install -c -m 0755 nxtvepg $(BINDIR) - install -c -m 0644 nxtvepg.1x $(MANDIR) + install -c -m 0644 nxtvepg.1x $(MANDIR)/nxtvepg.1 ##%.o: %.c ## $(CC) $(CFLAGS) -c *.c -o *.o