summaryrefslogtreecommitdiff
path: root/misc/nxtvepg/patches/patch-aa
blob: d6cb47279680199de8f45fa73ec5650e3a91134c (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
42
43
44
45
46
47
48
49
50
51
52
53
54
$NetBSD: patch-aa,v 1.4 2001/06/09 15:14:26 magick Exp $

--- Makefile.orig	Mon Jun  4 21:25:11 2001
+++ Makefile
@@ -32,33 +32,33 @@
 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 -lXmu -lm -ldl
+LDLIBS  = -ltk83 -ltcl83 -L$(X11BASE)/lib -lX11 -lm -lXmu
 # 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\"
 
 # path to the directory where the provider database files are kept
-DEFS   += -DEPG_DB_DIR=\"/usr/tmp/nxtvdb\"
+DEFS   += -DEPG_DB_DIR=_PATH_TMP\"nxtvdb\"
 
 #WARN    = -Wall -Wpointer-arith -Wnested-externs \
 #          -Werror -Wstrict-prototypes -Wmissing-prototypes
 WARN    = -Wall
 CC      = gcc
-CFLAGS  = -pipe $(WARN) $(INCS) $(DEFS) -O2
+CFLAGS  += $(WARN) $(INCS) $(DEFS)
 
 # ----- don't change anything below ------------------------------------------
 
@@ -85,7 +85,6 @@
 	test -d $(MANDIR) || mkdirhier $(MANDIR)
 	install -c -m 0755 nxtvepg     $(BINDIR)
 	install -c -m 0644 nxtvepg.1   $(MANDIR)
-	rm -f $(MANDIR)/nxtvepg.1x
 
 ##%.o: %.c
 ##	$(CC) $(CFLAGS) -c *.c -o *.o